commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1199303 - in /commons/proper/daemon/trunk/src/native/unix/support: apsupport.m4 config.sub
Date Tue, 08 Nov 2011 15:52:11 GMT
Author: mturk
Date: Tue Nov  8 15:52:11 2011
New Revision: 1199303

URL: http://svn.apache.org/viewvc?rev=1199303&view=rev
Log:
DAEMON-227: Modify config.sub by adding ia64[nw] and default to 32-bit ABI

Modified:
    commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
    commons/proper/daemon/trunk/src/native/unix/support/config.sub

Modified: commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4?rev=1199303&r1=1199302&r2=1199303&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 (original)
+++ commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 Tue Nov  8 15:52:11 2011
@@ -82,17 +82,9 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   sparc*)
     CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
     HOST_CPU=$host_cpu;;
-  i*86|x86)
-    if test "$supported_os" = "hp-ux"
-    then
-        CFLAGS="$CFLAGS -milp32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
-        LDFLAGS="$LDFLAGS -milp32"
-        HOST_CPU=IA64N
-    else
-        CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
-        HOST_CPU=i386
-    fi
-    ;;
+  i?86|x86)
+    CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
+    HOST_CPU=i386;;
   x86_64 | amd64)
     CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\""
     HOST_CPU=amd64;;
@@ -124,7 +116,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
     supported_os="mipsel"
     HOST_CPU=mipsel;;
-  ia64)
+  ia64w)
     if test "$supported_os" = "hp-ux"
     then
         CFLAGS="$CFLAGS -mlp64 -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
@@ -133,6 +125,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
         CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
     fi
     HOST_CPU=ia64;;
+  ia64|ia64n)
+    CFLAGS="$CFLAGS -milp32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
+    LDFLAGS="$LDFLAGS -milp32"
+    HOST_CPU=IA64N;;
   s390)
     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
     supported_os="s390"

Modified: commons/proper/daemon/trunk/src/native/unix/support/config.sub
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/support/config.sub?rev=1199303&r1=1199302&r2=1199303&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/support/config.sub (original)
+++ commons/proper/daemon/trunk/src/native/unix/support/config.sub Tue Nov  8 15:52:11 2011
@@ -256,7 +256,7 @@ case $basic_machine in
 	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia64 | ia64[nw] \
 	| ip2k | iq2000 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \



Mime
View raw message