OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

build: rename TARGET_ARCH2 to TARGET_NAME

Browse Source 
Do not introduce any new use yet.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Paolo Bonzini 2013-06-14 15:19:07 +01:00 committed by Peter Maydell
parent c14518e942
commit c1799a8462
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.target
View File

@ -15,14 +15,14 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/include
ifdef CONFIG_USER_ONLY ifdef CONFIG_USER_ONLY
# user emulator name # user emulator name
QEMU_PROG=qemu-$(TARGET_ARCH2) QEMU_PROG=qemu-$(TARGET_NAME)
else else
# system emulator name # system emulator name
ifneq (,$(findstring -mwindows,$(libs_softmmu))) ifneq (,$(findstring -mwindows,$(libs_softmmu)))
# Terminate program name with a 'w' because the linker builds a windows executable. # Terminate program name with a 'w' because the linker builds a windows executable.
QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF) QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
endif # windows executable endif # windows executable
QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF) QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
endif endif
PROGS=$(QEMU_PROG) PROGS=$(QEMU_PROG)

38
configure vendored
View File

@ -4083,10 +4083,10 @@ fi
for target in $target_list; do for target in $target_list; do
target_dir="$target" target_dir="$target"
config_target_mak=$target_dir/config-target.mak config_target_mak=$target_dir/config-target.mak
target_arch2=`echo $target | cut -d '-' -f 1` target_name=`echo $target | cut -d '-' -f 1`
target_bigendian="no" target_bigendian="no"
case "$target_arch2" in case "$target_name" in
armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
target_bigendian=yes target_bigendian=yes
;; ;;
@ -4096,17 +4096,17 @@ target_user_only="no"
target_linux_user="no" target_linux_user="no"
target_bsd_user="no" target_bsd_user="no"
case "$target" in case "$target" in
${target_arch2}-softmmu) ${target_name}-softmmu)
target_softmmu="yes" target_softmmu="yes"
;; ;;
${target_arch2}-linux-user) ${target_name}-linux-user)
if test "$linux" != "yes" ; then if test "$linux" != "yes" ; then
error_exit "Target '$target' is only available on a Linux host" error_exit "Target '$target' is only available on a Linux host"
fi fi
target_user_only="yes" target_user_only="yes"
target_linux_user="yes" target_linux_user="yes"
;; ;;
${target_arch2}-bsd-user) ${target_name}-bsd-user)
if test "$bsd" != "yes" ; then if test "$bsd" != "yes" ; then
error_exit "Target '$target' is only available on a BSD host" error_exit "Target '$target' is only available on a BSD host"
fi fi
@ -4124,14 +4124,14 @@ echo "# Automatically generated by configure - do not modify" > $config_target_m
bflt="no" bflt="no"
target_nptl="no" target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_name/g"`
gdb_xml_files="" gdb_xml_files=""
TARGET_ARCH="$target_arch2" TARGET_ARCH="$target_name"
TARGET_BASE_ARCH="" TARGET_BASE_ARCH=""
TARGET_ABI_DIR="" TARGET_ABI_DIR=""
case "$target_arch2" in case "$target_name" in
i386) i386)
;; ;;
x86_64) x86_64)
@ -4246,14 +4246,14 @@ upper() {
echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak 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_ARCH2=$target_arch2" >> $config_target_mak echo "TARGET_NAME=$target_name" >> $config_target_mak
echo "TARGET_TYPE=TARGET_TYPE_`upper $target_arch2`" >> $config_target_mak echo "TARGET_TYPE=TARGET_TYPE_`upper $target_name`" >> $config_target_mak
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
if [ "$TARGET_ABI_DIR" = "" ]; then if [ "$TARGET_ABI_DIR" = "" ]; then
TARGET_ABI_DIR=$TARGET_ARCH TARGET_ABI_DIR=$TARGET_ARCH
fi fi
echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
case "$target_arch2" in case "$target_name" in
i386|x86_64) i386|x86_64)
if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
echo "CONFIG_XEN=y" >> $config_target_mak echo "CONFIG_XEN=y" >> $config_target_mak
@ -4264,17 +4264,17 @@ case "$target_arch2" in
;; ;;
*) *)
esac esac
case "$target_arch2" in case "$target_name" in
arm|i386|x86_64|ppcemb|ppc|ppc64|s390x) arm|i386|x86_64|ppcemb|ppc|ppc64|s390x)
# Make sure the target and host cpus are compatible # Make sure the target and host cpus are compatible
if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \ if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
\( "$target_arch2" = "$cpu" -o \ \( "$target_name" = "$cpu" -o \
\( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc" \) -o \ \( "$target_name" = "ppcemb" -a "$cpu" = "ppc" \) -o \
\( "$target_arch2" = "ppc64" -a "$cpu" = "ppc" \) -o \ \( "$target_name" = "ppc64" -a "$cpu" = "ppc" \) -o \
\( "$target_arch2" = "ppc" -a "$cpu" = "ppc64" \) -o \ \( "$target_name" = "ppc" -a "$cpu" = "ppc64" \) -o \
\( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc64" \) -o \ \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
\( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \ \( "$target_name" = "x86_64" -a "$cpu" = "i386" \) -o \
\( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) \) ; then
echo "CONFIG_KVM=y" >> $config_target_mak echo "CONFIG_KVM=y" >> $config_target_mak
if test "$vhost_net" = "yes" ; then if test "$vhost_net" = "yes" ; then
echo "CONFIG_VHOST_NET=y" >> $config_target_mak echo "CONFIG_VHOST_NET=y" >> $config_target_mak

2
scripts/create_config
View File

@ -94,7 +94,7 @@ case $line in
TARGET_ABI_DIR=*) TARGET_ABI_DIR=*)
# do nothing # do nothing
;; ;;
TARGET_ARCH2=*) TARGET_NAME=*)
# do nothing # do nothing
;; ;;
TARGET_DIRS=*) TARGET_DIRS=*)