gwj / at91sam9263 · Commits

Commit 22f8a8b31c1e20df835eb4a779c573647753ee77

Authored by j_mayer
1 parent 1e42b8f0

Provision for PowerPC 64 with hypervisor mode support - not enabled for now. 

For consistency, group all PowerPC targets.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3387 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 17 additions and 7 deletions
Makefile.target
  View file @22f8a8b
... ... @@ -13,6 +13,9 @@ endif
13 13 ifeq ($(TARGET_ARCH), ppc64)
14 14 TARGET_BASE_ARCH:=ppc
15 15 endif
  16 +ifeq ($(TARGET_ARCH), ppc64h)
  17 +TARGET_BASE_ARCH:=ppc
  18 +endif
16 19 ifeq ($(TARGET_ARCH), ppcemb)
17 20 TARGET_BASE_ARCH:=ppc
18 21 endif
... ...
configure
  View file @22f8a8b
... ... @@ -500,11 +500,11 @@ fi
500 500 if test -z "$target_list" ; then
501 501 # these targets are portable
502 502 if [ "$softmmu" = "yes" ] ; then
503   - target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu arm-softmmu ppc64-softmmu ppcemb-softmmu m68k-softmmu sh4-softmmu cris-softmmu"
  503 + target_list="i386-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu arm-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu m68k-softmmu sh4-softmmu cris-softmmu"
504 504 fi
505 505 # the following are Linux specific
506 506 if [ "$linux_user" = "yes" ] ; then
507   - target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user ppc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user ppc64-linux-user sh4-linux-user cris-linux-user $target_list"
  507 + target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user sh4-linux-user ppc-linux-user ppc64-linux-user x86_64-linux-user cris-linux-user $target_list"
508 508 fi
509 509 # the following are Darwin specific
510 510 if [ "$darwin_user" = "yes" ] ; then
... ... @@ -934,8 +934,9 @@ target_bigendian="no"
934 934 [ "$target_cpu" = "sparc" ] && target_bigendian=yes
935 935 [ "$target_cpu" = "sparc64" ] && target_bigendian=yes
936 936 [ "$target_cpu" = "ppc" ] && target_bigendian=yes
937   -[ "$target_cpu" = "ppc64" ] && target_bigendian=yes
938 937 [ "$target_cpu" = "ppcemb" ] && target_bigendian=yes
  938 +[ "$target_cpu" = "ppc64" ] && target_bigendian=yes
  939 +[ "$target_cpu" = "ppc64h" ] && target_bigendian=yes
939 940 [ "$target_cpu" = "mips" ] && target_bigendian=yes
940 941 [ "$target_cpu" = "mipsn32" ] && target_bigendian=yes
941 942 [ "$target_cpu" = "mips64" ] && target_bigendian=yes
... ... @@ -1029,16 +1030,22 @@ elif test "$target_cpu" = "ppc" ; then
1029 1030 echo "TARGET_ARCH=ppc" >> $config_mak
1030 1031 echo "#define TARGET_ARCH \"ppc\"" >> $config_h
1031 1032 echo "#define TARGET_PPC 1" >> $config_h
  1033 +elif test "$target_cpu" = "ppcemb" ; then
  1034 + echo "TARGET_ARCH=ppcemb" >> $config_mak
  1035 + echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
  1036 + echo "#define TARGET_PPC 1" >> $config_h
  1037 + echo "#define TARGET_PPCEMB 1" >> $config_h
1032 1038 elif test "$target_cpu" = "ppc64" ; then
1033 1039 echo "TARGET_ARCH=ppc64" >> $config_mak
1034 1040 echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
1035 1041 echo "#define TARGET_PPC 1" >> $config_h
1036 1042 echo "#define TARGET_PPC64 1" >> $config_h
1037   -elif test "$target_cpu" = "ppcemb" ; then
1038   - echo "TARGET_ARCH=ppcemb" >> $config_mak
1039   - echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
  1043 +elif test "$target_cpu" = "ppc64h" ; then
  1044 + echo "TARGET_ARCH=ppc64h" >> $config_mak
  1045 + echo "#define TARGET_ARCH \"ppc64h\"" >> $config_h
1040 1046 echo "#define TARGET_PPC 1" >> $config_h
1041   - echo "#define TARGET_PPCEMB 1" >> $config_h
  1047 + echo "#define TARGET_PPC64 1" >> $config_h
  1048 + echo "#define TARGET_PPC64H 1" >> $config_h
1042 1049 elif test "$target_cpu" = "x86_64" ; then
1043 1050 echo "TARGET_ARCH=x86_64" >> $config_mak
1044 1051 echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
... ...