aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-01-06 18:27:58 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-01-06 18:27:58 +0000
commit0c64b9cd4a6174f01549e5005334226fc3152017 (patch)
treedee47c5851ccd33783024367bb7e45ef38c69b96
parentf0403c037d61d8f7cc8b361e87c707fade4c78bf (diff)
fixed ppc64abi32 executable name
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3895 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--Makefile.target7
-rwxr-xr-xconfigure2
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target
index cc8facb7ea..acd6cda4ad 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -43,7 +43,9 @@ LIBS=
HELPER_CFLAGS=$(CFLAGS)
DYNGEN=../dyngen$(EXESUF)
# user emulator name
+ifndef TARGET_ARCH2
TARGET_ARCH2=$(TARGET_ARCH)
+endif
ifeq ($(TARGET_ARCH),arm)
ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
TARGET_ARCH2=armeb
@@ -69,11 +71,6 @@ ifeq ($(TARGET_ARCH),mips64)
TARGET_ARCH2=mips64el
endif
endif
-ifeq ($(TARGET_ARCH),sparc64)
- ifeq ($(TARGET_ABI_DIR),sparc)
- TARGET_ARCH2=sparc32plus
- endif
-endif
QEMU_USER=qemu-$(TARGET_ARCH2)
# system emulator name
ifdef CONFIG_SOFTMMU
diff --git a/configure b/configure
index b16fb84eef..d86020e004 100755
--- a/configure
+++ b/configure
@@ -1073,6 +1073,7 @@ elif test "$target_cpu" = "sparc64" ; then
elif test "$target_cpu" = "sparc32plus" ; then
echo "TARGET_ARCH=sparc64" >> $config_mak
echo "TARGET_ABI_DIR=sparc" >> $config_mak
+ echo "TARGET_ARCH2=sparc32plus" >> $config_mak
echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
echo "#define TARGET_SPARC 1" >> $config_h
echo "#define TARGET_SPARC64 1" >> $config_h
@@ -1096,6 +1097,7 @@ elif test "$target_cpu" = "ppc64" ; then
elif test "$target_cpu" = "ppc64abi32" ; then
echo "TARGET_ARCH=ppc64" >> $config_mak
echo "TARGET_ABI_DIR=ppc" >> $config_mak
+ echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
echo "#define TARGET_PPC 1" >> $config_h
echo "#define TARGET_PPC64 1" >> $config_h