changeset 33962:c09e730ccf30

Autodetect 32- vs. 64-bit PowerPC just like for x86.
author reimar
date Thu, 01 Sep 2011 21:49:22 +0000
parents 30a443c59053
children 335de7e0f6ed
files configure
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Sep 01 20:17:03 2011 +0000
+++ b/configure	Thu Sep 01 21:49:22 2011 +0000
@@ -1465,8 +1465,7 @@
   case "$(uname -m 2>&1)" in
       x86_64|amd64|i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
-      macppc|ppc|Power*) host_arch=ppc ;;
-      ppc64) host_arch=ppc64 ;;
+      macppc|ppc|ppc64|Power*) host_arch=ppc ;;
       alpha) host_arch=alpha ;;
       sparc) host_arch=sparc ;;
       sparc64) host_arch=sparc64 ;;
@@ -1667,15 +1666,20 @@
 cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
 echo "yes"
 
-if test -z "$_target" && x86 ; then
+if test -z "$_target" ; then
   cat > $TMPC << EOF
 int main(void) {
     int test[(int)sizeof(char *)-7];
     return 0;
 }
 EOF
+if x86 ; then
   cc_check && host_arch=x86_64 || host_arch=i386
 fi
+if ppc ; then
+  cc_check && host_arch=ppc64 || host_arch=ppc
+fi
+fi
 
 echo "Detected operating system: $system_name"
 echo "Detected host architecture: $host_arch"
@@ -2234,7 +2238,7 @@
     def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
     iproc='ppc'
 
-    if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then
+    if test "$host_arch" = "ppc64" ; then
       subarch='ppc64'
       def_fast_64bit='#define HAVE_FAST_64BIT 1'
     fi