gwj / at91sam9263 · Commits

Commit 0c64b9cd4a6174f01549e5005334226fc3152017

Authored by bellard
1 parent f0403c03

fixed ppc64abi32 executable name 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3895 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
Makefile.target
  View file @0c64b9c
@@ -43,7 +43,9 @@ LIBS= @@ -43,7 +43,9 @@ LIBS=
43 HELPER_CFLAGS=$(CFLAGS) 43 HELPER_CFLAGS=$(CFLAGS)
44 DYNGEN=../dyngen$(EXESUF) 44 DYNGEN=../dyngen$(EXESUF)
45 # user emulator name 45 # user emulator name
  46 +ifndef TARGET_ARCH2
46 TARGET_ARCH2=$(TARGET_ARCH) 47 TARGET_ARCH2=$(TARGET_ARCH)
  48 +endif
47 ifeq ($(TARGET_ARCH),arm) 49 ifeq ($(TARGET_ARCH),arm)
48 ifeq ($(TARGET_WORDS_BIGENDIAN),yes) 50 ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
49 TARGET_ARCH2=armeb 51 TARGET_ARCH2=armeb
@@ -69,11 +71,6 @@ ifeq ($(TARGET_ARCH),mips64) @@ -69,11 +71,6 @@ ifeq ($(TARGET_ARCH),mips64)
69 TARGET_ARCH2=mips64el 71 TARGET_ARCH2=mips64el
70 endif 72 endif
71 endif 73 endif
72 -ifeq ($(TARGET_ARCH),sparc64)  
73 - ifeq ($(TARGET_ABI_DIR),sparc)  
74 - TARGET_ARCH2=sparc32plus  
75 - endif  
76 -endif  
77 QEMU_USER=qemu-$(TARGET_ARCH2) 74 QEMU_USER=qemu-$(TARGET_ARCH2)
78 # system emulator name 75 # system emulator name
79 ifdef CONFIG_SOFTMMU 76 ifdef CONFIG_SOFTMMU
configure
  View file @0c64b9c
@@ -1073,6 +1073,7 @@ elif test "$target_cpu" = "sparc64" ; then @@ -1073,6 +1073,7 @@ elif test "$target_cpu" = "sparc64" ; then
1073 elif test "$target_cpu" = "sparc32plus" ; then 1073 elif test "$target_cpu" = "sparc32plus" ; then
1074 echo "TARGET_ARCH=sparc64" >> $config_mak 1074 echo "TARGET_ARCH=sparc64" >> $config_mak
1075 echo "TARGET_ABI_DIR=sparc" >> $config_mak 1075 echo "TARGET_ABI_DIR=sparc" >> $config_mak
  1076 + echo "TARGET_ARCH2=sparc32plus" >> $config_mak
1076 echo "#define TARGET_ARCH \"sparc64\"" >> $config_h 1077 echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
1077 echo "#define TARGET_SPARC 1" >> $config_h 1078 echo "#define TARGET_SPARC 1" >> $config_h
1078 echo "#define TARGET_SPARC64 1" >> $config_h 1079 echo "#define TARGET_SPARC64 1" >> $config_h
@@ -1096,6 +1097,7 @@ elif test "$target_cpu" = "ppc64" ; then @@ -1096,6 +1097,7 @@ elif test "$target_cpu" = "ppc64" ; then
1096 elif test "$target_cpu" = "ppc64abi32" ; then 1097 elif test "$target_cpu" = "ppc64abi32" ; then
1097 echo "TARGET_ARCH=ppc64" >> $config_mak 1098 echo "TARGET_ARCH=ppc64" >> $config_mak
1098 echo "TARGET_ABI_DIR=ppc" >> $config_mak 1099 echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1100 + echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
1099 echo "#define TARGET_ARCH \"ppc64\"" >> $config_h 1101 echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
1100 echo "#define TARGET_PPC 1" >> $config_h 1102 echo "#define TARGET_PPC 1" >> $config_h
1101 echo "#define TARGET_PPC64 1" >> $config_h 1103 echo "#define TARGET_PPC64 1" >> $config_h