1 files changed, 95 insertions, 45 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 25a3703c1f..0715d378d9 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -23,6 +23,7 @@
 PREFIX=""
 SUFFIX=""
 TEST="false"
+EXE=""
 
 # pick up any command line args to config
 for i
@@ -110,16 +111,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "m68k-apple-aux3"; exit 0
         ;;
 
-    AIX:[3456789]:4:*)
-        echo "${MACHINE}-ibm-aix43"; exit 0
+    AIX:[3-9]:4:*)
+        echo "${MACHINE}-ibm-aix"; exit 0
         ;;
 
-    AIX:*:[56789]:*)
-        echo "${MACHINE}-ibm-aix43"; exit 0
+    AIX:*:[5-9]:*)
+        echo "${MACHINE}-ibm-aix"; exit 0
         ;;
 
     AIX:*)
-        echo "${MACHINE}-ibm-aix"; exit 0
+        echo "${MACHINE}-ibm-aix3"; exit 0
         ;;
 
     dgux:*)
@@ -288,6 +289,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACHINE}-whatever-sysv4"; exit 0
         ;;
 
+    VOS:*:*:i786)
+     echo "i386-stratus-vos"; exit 0
+     ;;
+
+    VOS:*:*:*)
+     echo "hppa1.1-stratus-vos"; exit 0
+     ;;
+
     *:4*:R4*:m88k)
         echo "${MACHINE}-whatever-sysv4"; exit 0
         ;;
@@ -328,6 +337,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "mips-sony-newsos4"; exit 0;
         ;;
 
+    MINGW*)
+        echo "${MACHINE}-whatever-mingw"; echo 0;
+        ;;
     CYGWIN*)
         case "$RELEASE" in
             [bB]*|1.0|1.[12].*)
@@ -433,7 +445,7 @@ if [ "$SYSTEM" = "SunOS" ]; then
         egrep -e '^cc: .* C [0-9]\.[0-9]' | \
         sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
   CCVER=${CCVER:-0}
-  if [ $CCVER -gt 40 ]; then
+  if [ $MACHINE != i86pc -a $CCVER -gt 40 ]; then
     CC=cc       # overrides gcc!!!
     if [ $CCVER -eq 50 ]; then
       echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
@@ -482,29 +494,29 @@ case "$GUESSOS" in
         OUT="irix-$CC"
         ;;
   mips3-sgi-irix)
-        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
-        CPU=${CPU:-0}
-        if [ $CPU -ge 5000 ]; then
-                options="$options -mips4"
-        else
-                options="$options -mips3"
-        fi
+        #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        #CPU=${CPU:-0}
+        #if [ $CPU -ge 5000 ]; then
+        #       options="$options -mips4"
+        #else
+        #       options="$options -mips3"
+        #fi
         OUT="irix-mips3-$CC"
         ;;
   mips4-sgi-irix64)
         echo "WARNING! If you wish to build 64-bit library, then you have to"
         echo "         invoke './Configure irix64-mips4-$CC' *manually*."
-        if [ "$TEST" = "false" ]; then
+        if [ "$TEST" = "false" -a -t 1 ]; then
           echo "         You have about 5 seconds to press Ctrl-C to abort."
-          (stty -icanon min 0 time 50; read waste) < /dev/tty
+          (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
         fi
-        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
-        CPU=${CPU:-0}
-        if [ $CPU -ge 5000 ]; then
-                options="$options -mips4"
-        else
-                options="$options -mips3"
-        fi
+        #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        #CPU=${CPU:-0}
+        #if [ $CPU -ge 5000 ]; then
+        #        options="$options -mips4"
+        #else
+        #        options="$options -mips3"
+        #fi
         OUT="irix-mips3-$CC"
         ;;
   alpha-*-linux2)
@@ -538,9 +550,14 @@ EOF
         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" ;;
+        echo "WARNING! If you wish to build 64-bit library, then you have to"
+        echo "         invoke './Configure linux-ppc64' *manually*."
+        if [ "$TEST" = "false" -a -t 1 ]; then
+            echo "         You have about 5 seconds to press Ctrl-C to abort."
+            (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+        fi
+        OUT="linux-ppc"
+        ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -551,9 +568,9 @@ EOF
         echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
         echo "         and wish to build 64-bit library, then you have to"
         echo "         invoke './Configure linux64-sparcv9' *manually*."
-        if [ "$TEST" = "false" ]; then
+        if [ "$TEST" = "false" -a -t 1 ]; then
           echo "          You have about 5 seconds to press Ctrl-C to abort."
-          (stty -icanon min 0 time 50; read waste) < /dev/tty
+          (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
         fi
         OUT="linux-sparcv9" ;;
   sparc-*-linux2)
@@ -584,7 +601,9 @@ EOF
 
         options="$options -mschedule=$CPUSCHEDULE -march=$CPUARCH"
         OUT="linux-parisc" ;;
-  arm*-*-linux2) OUT="linux-elf-arm" ;;
+  arm*b-*-linux2) OUT="linux-elf-arm"; options="$options -DB_ENDIAN" ;;
+  arm*l-*-linux2) OUT="linux-elf-arm"; options="$options -DL_ENDIAN" ;;
+  arm*-*-linux2)  OUT="linux-elf-arm" ;;
   s390-*-linux2) OUT="linux-s390" ;;
   s390x-*-linux?) OUT="linux-s390x" ;;
   x86_64-*-linux?) OUT="linux-x86_64" ;;
@@ -608,9 +627,9 @@ EOF
             if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
                 echo "WARNING! If you wish to build 64-bit library, then you have to"
                 echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
-                if [ "$TEST" = "false" ]; then
+                if [ "$TEST" = "false" -a -t 1 ]; then
                   echo "         You have about 5 seconds to press Ctrl-C to abort."
-                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
                 fi
             elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
                 # $GCC_ARCH denotes default ABI chosen by compiler driver
@@ -620,17 +639,17 @@ EOF
                 OUT="solaris64-sparcv9-gcc"
                 echo "WARNING! If you wish to build 32-bit library, then you have to"
                 echo "         invoke './Configure solaris-sparcv9-gcc' *manually*."
-                if [ "$TEST" = "false" ]; then
+                if [ "$TEST" = "false" -a -t 1 ]; then
                   echo "         You have about 5 seconds to press Ctrl-C to abort."
-                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
                 fi
             elif [ "$GCC_ARCH" = "-m32" ]; then
                 echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
                 echo "        and wish to build 64-bit library, then you have to"
                 echo "        invoke './Configure solaris64-sparcv9-gcc' *manually*."
-                if [ "$TEST" = "false" ]; then
+                if [ "$TEST" = "false" -a -t 1 ]; then
                   echo "         You have about 5 seconds to press Ctrl-C to abort."
-                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
                 fi
             fi
         fi
@@ -638,7 +657,14 @@ EOF
   sun4m-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)     OUT="solaris-sparcv7-$CC" ;;
-  *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
+  *86*-*-solaris2)
+        ISA64=`(isalist) 2>/dev/null | grep amd64`
+        if [ "$ISA64" != "" ]; then
+            OUT="solaris64-x86_64-$CC"
+        else
+            OUT="solaris-x86-$CC"
+        fi
+        ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
   sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
@@ -679,6 +705,10 @@ EOF
   *-*-UnixWare21*) OUT="unixware-2.1" ;;
   *-*-Unixware20*) OUT="unixware-2.0" ;;
   *-*-Unixware21*) OUT="unixware-2.1" ;;
+  *-*-vos)
+        options="$options no-threads no-shared no-asm no-dso"
+        EXE=".pm"
+        OUT="vos-$CC" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
@@ -702,9 +732,9 @@ EOF
              echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi."
              echo "         If you wish to build 32-bit library, the you have to"
              echo "         invoke './Configure hpux-ia64-cc' *manually*."
-             if [ "$TEST" = "false" ]; then
+             if [ "$TEST" = "false" -a -t 1 ]; then
                 echo "         You have about 5 seconds to press Ctrl-C to abort."
-                (stty -icanon min 0 time 50; read waste) < /dev/tty
+                (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
              fi
              OUT="hpux64-ia64-cc"
         elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
@@ -714,9 +744,9 @@ EOF
              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*."
-                if [ "$TEST" = "false" ]; then
+                if [ "$TEST" = "false" -a -t 1 ]; then
                   echo "         You have about 5 seconds to press Ctrl-C to abort."
-                  (stty -icanon min 0 time 50; read waste) < /dev/tty
+                  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
                 fi
              fi
         elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU
@@ -728,8 +758,28 @@ EOF
         fi
         options="$options -D_REENTRANT" ;;
   *-hpux)       OUT="hpux-parisc-$CC" ;;
+  *-aix)
+        KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
+        KERNEL_BITS=${KERNEL_BITS:-32}
+        OBJECT_MODE=${OBJECT_MODE:-32}
+        if [ "$CC" = "gcc" ]; then
+            OUT="aix-gcc"
+        elif [ $OBJECT_MODE -eq 64 ]; then
+            echo 'Your $OBJECT_MODE was found to be set to 64' 
+            OUT="aix64-cc"
+        else
+            OUT="aix-cc"
+            if [ $KERNEL_BITS -eq 64 ]; then
+                echo "WARNING! If you wish to build 64-bit kit, then you have to"
+                echo "         invoke './Configure aix64-cc' *manually*."
+                if [ "$TEST" = "false" -a -t 1 ]; then
+                    echo "         You have ~5 seconds to press Ctrl-C to abort."
+                    (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                fi
+            fi
+        fi
+        ;;
   # these are all covered by the catchall below
-  # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
   *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
@@ -806,8 +856,8 @@ fi
 
 if [ ".$PERL" = . ] ; then
         for i in . `echo $PATH | sed 's/:/ /g'`; do
-                if [ -f "$i/perl5" ] ; then
-                        PERL="$i/perl5"
+                if [ -f "$i/perl5$EXE" ] ; then
+                        PERL="$i/perl5$EXE"
                         break;
                 fi;
         done
@@ -815,9 +865,9 @@ fi
 
 if [ ".$PERL" = . ] ; then
         for i in . `echo $PATH | sed 's/:/ /g'`; do
-                if [ -f "$i/perl" ] ; then
-                        if "$i/perl" -e 'exit($]<5.0)'; then
-                                PERL="$i/perl"
+                if [ -f "$i/perl$EXE" ] ; then
+                        if "$i/perl$EXE" -e 'exit($]<5.0)'; then
+                                PERL="$i/perl$EXE"
                                 break;
                         fi;
                 fi;