Correct the return codes for ecdsatest.

[openssl.git] / config

diff --git a/config b/config
index 79ce83aac3d6b8f462fa5b49309af06d0583b5d5..29fc9cd4e03f34c17193bf0ec0571c085ae45cc2 100755 (executable)
--- a/config
+++ b/config
@@ -110,12 +110,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "m68k-apple-aux3"; exit 0
        ;;
 
-    AIX:[3456789]:4:*)
-       echo "${MACHINE}-ibm-aix43"; exit 0
-       ;;
-
-    AIX:*:[56789]:*)
-       echo "${MACHINE}-ibm-aix43"; exit 0
+    AIX:*:[5-9]:*)
+       echo "${MACHINE}-ibm-aix5"; exit 0
        ;;
 
     AIX:*)
@@ -134,7 +130,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "$HPUXVER" in
            1[0-9].*)   # HPUX 10 and 11 targets are unified
-               echo "${MACHINE}-hp-hpux10"; exit 0
+               echo "${MACHINE}-hp-hpux1x"; exit 0
                ;;
            *)
                echo "${MACHINE}-hp-hpux"; exit 0
@@ -410,9 +406,10 @@ if [ "$SYSTEM" = "HP-UX" ];then
   GCC_BITS="32"
   if [ $GCCVER -ge 30 ]; then
     # PA64 support only came in with gcc 3.0.x.
-    # We look for the preprocessor symbol __LP64__ indicating
-    # 64bit bit long and pointer.  sizeof(int) == 32 on HPUX64.
-    if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then
+    # We check if the preprocessor symbol __LP64__ is defined...
+    if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
+      : # __LP64__ has slipped through, it therefore is not defined
+    else
       GCC_BITS="64"
     fi
   fi
@@ -536,10 +533,7 @@ EOF
        ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`
        rm dummy dummy.c
        ;;
-  ppc64-*-linux2)
-       #Use the standard target for PPC architecture until we create a
-       #special one for the 64bit architecture.
-       OUT="linux-ppc" ;;
+  ppc64-*-linux2) OUT="linux-ppc64" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -682,15 +676,8 @@ EOF
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
   *-hpux1*)
-       if [ $CC = "gcc" ];
-       then
-         if [ $GCC_BITS = "64" ]; then
-           OUT="hpux64-parisc-gcc"
-         else
-           OUT="hpux-parisc-gcc"
-         fi
-       else
-         OUT="hpux-parisc-$CC"
+       if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
+           OUT="hpux64-parisc2-gcc"
        fi
        KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
        KERNEL_BITS=${KERNEL_BITS:-32}
@@ -707,9 +694,7 @@ EOF
             fi
             OUT="hpux64-ia64-cc"
        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
-            if [ "$CC" = "cc" ]; then
-               OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc?
-            fi
+            OUT=${OUT:-"hpux-parisc2-${CC}"}
             if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
                echo "WARNING! If you wish to build 64-bit library then you have to"
                echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
@@ -719,14 +704,43 @@ EOF
                fi
             fi
        elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU
-            :
+            OUT="hpux-parisc-${CC}
        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU
-            :
+            OUT="hpux-parisc-${CC}
        else                                    # Motorola(?) CPU
             OUT="hpux-$CC"
        fi
        options="$options -D_REENTRANT" ;;
   *-hpux)      OUT="hpux-parisc-$CC" ;;
+  *-aix5)
+       KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
+       KERNEL_BITS=${KERNEL_BITS:-32}
+       if [ $KERNEL_BITS -eq 64 ]; then
+           # we default to 64-bit because PKI performance is >3x better...
+           OBJECT_MODE=${OBJECT_MODE:-$KERNEL_BITS}
+       else
+           OBJECT_MODE=32
+       fi
+       OUT="aix-cc"
+       if [ "$CC" = "cc" -a $OBJECT_MODE -eq 64 ]; then
+           OUT="aix64-cc"
+           echo "WARNING! If you wish to build 32-bit kit, then you have to"
+           echo "         invoke './Configure aix-cc' *manually*."
+           if [ "$TEST" = "false" ]; then
+               echo "         You have ~5 seconds to press Ctrl-C to abort."
+               (stty -icanon min 0 time 50; read waste) < /dev/tty
+           fi
+       elif [ "$CC" = "gcc" ]; then
+           OUT="aix-gcc"
+       fi
+       ;;
+  *-aix)
+       if [ "$CC" = "gcc" ]; then
+           OUT="aix-gcc"
+       else
+           OUT="aix43-cc"
+       fi
+       ;;
   # these are all covered by the catchall below
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;