ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main: use TARGET_ARCH only for the target-specific #define 

Everything else needs to match the executable name, which is
TARGET_NAME.

Before:
    $ sh4eb-linux-user/qemu-sh4eb --help
    usage: qemu-sh4 [options] program [arguments...]
    Linux CPU emulator (compiled for sh4 emulation)

After:
    $ sh4eb-linux-user/qemu-sh4eb --help
    usage: qemu-sh4eb [options] program [arguments...]
    Linux CPU emulator (compiled for sh4eb emulation)

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-5-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Paolo Bonzini 2013-06-04 14:45:27 +02:00 committed by Peter Maydell
parent b9a7b74f77
commit 2e59915d43
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch_init.c
View File

@ -123,7 +123,7 @@ static struct defconfig_file {
bool userconfig; bool userconfig;
} default_config_files[] = { } default_config_files[] = {
{ CONFIG_QEMU_CONFDIR "/qemu.conf", true }, { CONFIG_QEMU_CONFDIR "/qemu.conf", true },
{ CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, { CONFIG_QEMU_CONFDIR "/target-" TARGET_NAME ".conf", true },
{ NULL }, /* end of list */ { NULL }, /* end of list */
}; };

6
bsd-user/main.c
View File

@ -670,8 +670,8 @@ void cpu_loop(CPUSPARCState *env)
static void usage(void) static void usage(void)
{ {
printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n" printf("qemu-" TARGET_NAME " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
"usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n" "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"
"BSD CPU emulator (compiled for %s emulation)\n" "BSD CPU emulator (compiled for %s emulation)\n"
"\n" "\n"
"Standard options:\n" "Standard options:\n"
@ -706,7 +706,7 @@ static void usage(void)
"Note that if you provide several changes to single variable\n" "Note that if you provide several changes to single variable\n"
"last change will stay in effect.\n" "last change will stay in effect.\n"
, ,
TARGET_ARCH, TARGET_NAME,
interp_prefix, interp_prefix,
x86_stack_size); x86_stack_size);
exit(1); exit(1);

1
configure vendored
View File

@ -4243,7 +4243,6 @@ upper() {
echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]' echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]'
} }
echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak
target_arch_name="`upper $TARGET_ARCH`" target_arch_name="`upper $TARGET_ARCH`"
echo "TARGET_$target_arch_name=y" >> $config_target_mak echo "TARGET_$target_arch_name=y" >> $config_target_mak
echo "TARGET_NAME=$target_name" >> $config_target_mak echo "TARGET_NAME=$target_name" >> $config_target_mak

6
linux-user/main.c
View File

@ -3339,7 +3339,7 @@ static void handle_arg_strace(const char *arg)
static void handle_arg_version(const char *arg) static void handle_arg_version(const char *arg)
{ {
printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION
", Copyright (c) 2003-2008 Fabrice Bellard\n"); ", Copyright (c) 2003-2008 Fabrice Bellard\n");
exit(0); exit(0);
} }
@ -3400,8 +3400,8 @@ static void usage(void)
int maxarglen; int maxarglen;
int maxenvlen; int maxenvlen;
printf("usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n" printf("usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"
"Linux CPU emulator (compiled for " TARGET_ARCH " emulation)\n" "Linux CPU emulator (compiled for " TARGET_NAME " emulation)\n"
"\n" "\n"
"Options and associated environment variables:\n" "Options and associated environment variables:\n"
"\n"); "\n");

9
scripts/create_config
View File

@ -77,16 +77,10 @@ case $line in
value=${line#*=} value=${line#*=}
echo "#define $name $value" echo "#define $name $value"
;; ;;
TARGET_ARCH=*) # configuration
target_arch=${line#*=}
echo "#define TARGET_ARCH \"$target_arch\""
;;
TARGET_BASE_ARCH=*) # configuration TARGET_BASE_ARCH=*) # configuration
target_base_arch=${line#*=} target_base_arch=${line#*=}
if [ "$target_base_arch" != "$target_arch" ]; then
base_arch_name=`echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]'` base_arch_name=`echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]'`
echo "#define TARGET_$base_arch_name 1" echo "#define TARGET_$base_arch_name 1"
fi
;; ;;
TARGET_XML_FILES=*) TARGET_XML_FILES=*)
# do nothing # do nothing
@ -95,7 +89,8 @@ case $line in
# do nothing # do nothing
;; ;;
TARGET_NAME=*) TARGET_NAME=*)
# do nothing target_name=${line#*=}
echo "#define TARGET_NAME \"$target_name\""
;; ;;
TARGET_DIRS=*) TARGET_DIRS=*)
# do nothing # do nothing