diff options
| -rw-r--r-- | Makefile.target | 7 | ||||
| -rwxr-xr-x | configure | 2 |
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 @@ -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 |