Don't use expired certificates if possible.

[openssl.git] / config

diff --git a/config b/config
index 46102cebde5da76d6ec532dfcf5499ba2880d834..c6488ee55a644373f1fb578627dffc1f02c5349a 100755 (executable)
--- a/config
+++ b/config
@@ -23,6 +23,7 @@
 PREFIX=""
 SUFFIX=""
 TEST="false"
 PREFIX=""
 SUFFIX=""
 TEST="false"

+EXE=""

 
 # pick up any command line args to config
 for i
 
 # pick up any command line args to config
 for i


@@ -47,10 +48,10 @@ done
 
 # First get uname entries that we use below
 
 
 # First get uname entries that we use below
 

-MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
-RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
-SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
-VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
+[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
+[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
+[ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
+[ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"

 
 
 # Now test for ISC and SCO, since it is has a braindamaged uname.
 
 
 # Now test for ISC and SCO, since it is has a braindamaged uname.


@@ -83,7 +84,7 @@ if [ "x$XREL" != "x" ]; then
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;

-           5)
+           5*)

                case "x${VERSION}" in
                    # We hardcode i586 in place of ${MACHINE} for the
                    # following reason. The catch is that even though Pentium
                case "x${VERSION}" in
                    # We hardcode i586 in place of ${MACHINE} for the
                    # following reason. The catch is that even though Pentium


@@ -92,8 +93,7 @@ if [ "x$XREL" != "x" ]; then
                    # with i386 is that it makes ./config pass 386 to
                    # ./Configure, which in turn makes make generate
                    # inefficient SHA-1 (for this moment) code.
                    # with i386 is that it makes ./config pass 386 to
                    # ./Configure, which in turn makes make generate
                    # inefficient SHA-1 (for this moment) code.

-                   x7*)  echo "i586-sco-unixware7";           exit 0 ;;
-                   x8*)  echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;;
+                   x[678]*)  echo "i586-sco-unixware7"; exit 0 ;;

                esac
                ;;
        esac
                esac
                ;;
        esac


@@ -110,12 +110,24 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "m68k-apple-aux3"; exit 0
        ;;
 
        echo "m68k-apple-aux3"; exit 0
        ;;
 

+    AIX:[3-9]:4:*)
+       echo "${MACHINE}-ibm-aix"; exit 0
+       ;;
+

     AIX:*:[5-9]:*)
     AIX:*:[5-9]:*)

-       echo "${MACHINE}-ibm-aix5"; exit 0
+       echo "${MACHINE}-ibm-aix"; exit 0

        ;;
 
     AIX:*)
        ;;
 
     AIX:*)

-       echo "${MACHINE}-ibm-aix"; exit 0
+       echo "${MACHINE}-ibm-aix3"; exit 0
+       ;;
+
+    BeOS:*:BePC)
+    if [ -e /boot/develop/headers/be/bone ]; then
+               echo "beos-x86-bone"; exit 0
+       else
+               echo "beos-x86-r5"; exit 0
+       fi

        ;;
 
     dgux:*)
        ;;
 
     dgux:*)


@@ -266,7 +278,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
                echo "ppc-apple-darwin${VERSION}"
                ;;
            *)
                echo "ppc-apple-darwin${VERSION}"
                ;;
            *)

-               echo "i386-apple-darwin${VERSION}"
+               echo "i686-apple-darwin${VERSION}"

                ;;
        esac
        exit 0
                ;;
        esac
        exit 0


@@ -284,6 +296,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-sysv4"; exit 0
        ;;
 
        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
        ;;
     *:4*:R4*:m88k)
        echo "${MACHINE}-whatever-sysv4"; exit 0
        ;;


@@ -324,6 +344,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "mips-sony-newsos4"; exit 0;
        ;;
 
        echo "mips-sony-newsos4"; exit 0;
        ;;
 

+    MINGW*)
+       echo "${MACHINE}-whatever-mingw"; exit 0;
+       ;;

     CYGWIN*)
        case "$RELEASE" in
            [bB]*|1.0|1.[12].*)
     CYGWIN*)
        case "$RELEASE" in
            [bB]*|1.0|1.[12].*)


@@ -347,6 +370,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
     NONSTOP_KERNEL*)
        echo "nsr-tandem-nsk"; exit 0;
        ;;
     NONSTOP_KERNEL*)
        echo "nsr-tandem-nsk"; exit 0;
        ;;

+
+    vxworks*)
+       echo "${MACHINE}-whatever-vxworks"; exit 0;
+       ;;

 esac
 
 #
 esac
 
 #


@@ -355,7 +382,7 @@ esac
 #
 
 # Do the Apollo stuff first. Here, we just simply assume
 #
 
 # Do the Apollo stuff first. Here, we just simply assume

-# that the existance of the /usr/apollo directory is proof
+# that the existence of the /usr/apollo directory is proof

 # enough
 if [ -d /usr/apollo ]; then
     echo "whatever-apollo-whatever"
 # enough
 if [ -d /usr/apollo ]; then
     echo "whatever-apollo-whatever"


@@ -384,21 +411,22 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 

-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
-  CC=gcc
-  # then strip off whatever prefix egcs prepends the number with...
-  # Hopefully, this will work for any future prefixes as well.
-  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
-  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-  # does give us what we want though, so we use that.  We just just the
-  # major and minor version numbers.
-  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-else
-  CC=cc
+# Only set CC if not supplied already
+if [ -z "$CROSS_COMPILE$CC" ]; then
+  GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
+  if [ "$GCCVER" != "" ]; then
+    # then strip off whatever prefix egcs prepends the number with...
+    # Hopefully, this will work for any future prefixes as well.
+    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
+    # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
+    # does give us what we want though, so we use that.  We just just the
+    # major and minor version numbers.
+    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
+    CC=gcc
+  else
+    CC=cc
+  fi

 fi
 GCCVER=${GCCVER:-0}
 if [ "$SYSTEM" = "HP-UX" ];then
 fi
 GCCVER=${GCCVER:-0}
 if [ "$SYSTEM" = "HP-UX" ];then


@@ -429,15 +457,13 @@ if [ "$SYSTEM" = "SunOS" ]; then
        egrep -e '^cc: .* C [0-9]\.[0-9]' | \
        sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
   CCVER=${CCVER:-0}
        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"
       echo "         patch #107357-01 or later applied."
       sleep 5
     fi
     CC=cc      # overrides gcc!!!
     if [ $CCVER -eq 50 ]; then
       echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
       echo "         patch #107357-01 or later applied."
       sleep 5
     fi

-  elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
-    CC=sc3

   fi
 fi
 
   fi
 fi
 


@@ -469,6 +495,12 @@ echo Operating system: $GUESSOS
 # script above so we end up with values in vars but that would take
 # more time that I want to waste at the moment
 case "$GUESSOS" in
 # script above so we end up with values in vars but that would take
 # more time that I want to waste at the moment
 case "$GUESSOS" in

+  uClinux*64*)
+    OUT=uClinux-dist64
+       ;;
+  uClinux*)
+    OUT=uClinux-dist
+       ;;

   mips2-sgi-irix)
        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
        CPU=${CPU:-0}
   mips2-sgi-irix)
        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
        CPU=${CPU:-0}


@@ -478,88 +510,138 @@ case "$GUESSOS" in
        OUT="irix-$CC"
        ;;
   mips3-sgi-irix)
        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*."
        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."
          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

-        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"
        ;;
        OUT="irix-mips3-$CC"
        ;;

+  ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
+  ppc-apple-darwin*)
+       ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
+           echo "WARNING! If you wish to build 64-bit library, then you have to"
+           echo "         invoke './Configure darwin64-ppc-cc' *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
+       fi
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-ppc-cc"
+       else
+           OUT="darwin-ppc-cc"
+       fi ;;
+  i?86-apple-darwin*)
+       ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
+       if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
+           echo "WARNING! If you wish to build 64-bit library, then you have to"
+           echo "         invoke './Configure darwin64-x86_64-cc' *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
+       fi
+       if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="darwin64-x86_64-cc"
+       else
+           OUT="darwin-i386-cc"
+       fi ;;
+  armv6+7-*-iphoneos)
+       options="$options -arch%20armv6 -arch%20armv7"
+       OUT="iphoneos-cross" ;;
+  *-*-iphoneos)
+       options="$options -arch%20${MACHINE}"
+       OUT="iphoneos-cross" ;;

   alpha-*-linux2)
   alpha-*-linux2)

-        ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo`
+        ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`

        case ${ISA:-generic} in
        case ${ISA:-generic} in

-       *[67])  OUT="linux-alpha+bwx-$CC" ;;
+       *[678]) OUT="linux-alpha+bwx-$CC" ;;

        *)      OUT="linux-alpha-$CC" ;;
        esac
        if [ "$CC" = "gcc" ]; then
            case ${ISA:-generic} in
            EV5|EV45)           options="$options -mcpu=ev5";;
            EV56|PCA56)         options="$options -mcpu=ev56";;
        *)      OUT="linux-alpha-$CC" ;;
        esac
        if [ "$CC" = "gcc" ]; then
            case ${ISA:-generic} in
            EV5|EV45)           options="$options -mcpu=ev5";;
            EV56|PCA56)         options="$options -mcpu=ev56";;

-           EV6|EV67|PCA57)     options="$options -mcpu=ev6";;
+           *)                  options="$options -mcpu=ev6";;

            esac
        fi
        ;;
            esac
        fi
        ;;

-  mips-*-linux?)
-          cat >dummy.c <<EOF
-#include <stdio.h>  /* for printf() prototype */
-        int main (argc, argv) int argc; char *argv[]; {
-#ifdef __MIPSEB__
-  printf ("linux-%s\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("linux-%sel\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-       ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`
-       rm dummy dummy.c
+  ppc64-*-linux2)
+       if [ -z "$KERNEL_BITS" ]; then
+           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
+       fi
+       if [ "$KERNEL_BITS" = "64" ]; then
+           OUT="linux-ppc64"
+       else
+           OUT="linux-ppc"
+           (echo "__LP64__" | gcc -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null) || options="$options -m32"
+       fi

        ;;
        ;;

-  ppc64-*-linux2) OUT="linux-ppc64" ;;
+  ppc64le-*-linux2) OUT="linux-ppc64le" ;;

   ppc-*-linux2) OUT="linux-ppc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;

-  m68k-*-linux*) OUT="linux-m68k" ;;
+  mips64*-*-linux2)
+       echo "WARNING! If you wish to build 64-bit library, then you have to"
+       echo "         invoke './Configure linux64-mips64' *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-mips64"
+       ;;
+  mips*-*-linux2) OUT="linux-mips32" ;;
+  ppc60x-*-vxworks*) OUT="vxworks-ppc60x" ;;
+  ppcgen-*-vxworks*) OUT="vxworks-ppcgen" ;;
+  pentium-*-vxworks*) OUT="vxworks-pentium" ;;
+  simlinux-*-vxworks*) OUT="vxworks-simlinux" ;;
+  mips-*-vxworks*) OUT="vxworks-mips";;

   ia64-*-linux?) OUT="linux-ia64" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;

-  ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
-  ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
-  i386-apple-darwin*) OUT="darwin-i386-cc" ;;

   sparc64-*-linux2)
        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*."
   sparc64-*-linux2)
        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."
          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)
        fi
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)

-       KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
+       KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo`

        case ${KARCH:-sun4} in
        sun4u*) OUT="linux-sparcv9" ;;
        sun4m)  OUT="linux-sparcv8" ;;
        sun4d)  OUT="linux-sparcv8" ;;
        case ${KARCH:-sun4} in
        sun4u*) OUT="linux-sparcv9" ;;
        sun4m)  OUT="linux-sparcv8" ;;
        sun4d)  OUT="linux-sparcv8" ;;

-       *)      OUT="linux-sparcv7" ;;
+       *)      OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;

        esac ;;
        esac ;;

-  parisc-*-linux2)
-        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
-       CPUSCHEDULE=`awk '/^cpu.[       ]: PA/{print substr($3,3)}' /proc/cpuinfo`
+  parisc*-*-linux2)
+       # 64-bit builds under parisc64 linux are not supported and
+       # compiler is expected to generate 32-bit objects...
+       CPUARCH=`awk '/cpu family/{print substr($5,1,3); exit(0);}' /proc/cpuinfo`
+       CPUSCHEDULE=`awk '/^cpu.[       ]*: PA/{print substr($3,3); exit(0);}' /proc/cpuinfo`

 
        # ??TODO ??  Model transformations
        # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
 
        # ??TODO ??  Model transformations
        # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off


@@ -572,38 +654,56 @@ EOF
        #         PA8500   -> 8000   (2.0)
        #         PA8600   -> 8000   (2.0)
 
        #         PA8500   -> 8000   (2.0)
        #         PA8600   -> 8000   (2.0)
 

-       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'`
+       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'`

        # Finish Model transformations
 
        # Finish Model transformations
 

-       options="$options -mschedule=$CPUSCHEDULE -march=$CPUARCH"
-       OUT="linux-parisc" ;;
-  arm*-*-linux2) OUT="linux-elf-arm" ;;
-  s390-*-linux2) OUT="linux-s390" ;;
-  s390x-*-linux?) OUT="linux-s390x" ;;
+       options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH"
+       OUT="linux-generic32" ;;
+  armv[1-3]*-*-linux2) OUT="linux-generic32" ;;
+  armv[7-9]*-*-linux2) OUT="linux-armv4"; options="$options -march=armv7-a" ;;
+  arm*-*-linux2) OUT="linux-armv4" ;;
+  aarch64-*-linux2) OUT="linux-generic64" ;;
+  sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
+  sh*-*-linux2)  OUT="linux-generic32"; options="$options -DL_ENDIAN" ;;
+  m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
+  s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
+  s390x-*-linux2)
+       # To be uncommented when glibc bug is fixed, see Configure...
+       #if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then
+       #  echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you"
+       #  echo "         have to invoke './Configure linux32-s390x' *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
+       #fi
+       OUT="linux64-s390x"
+       ;;

   x86_64-*-linux?) OUT="linux-x86_64" ;;
   x86_64-*-linux?) OUT="linux-x86_64" ;;

-  *-*-linux2) OUT="linux-elf"
+  *86-*-linux2) OUT="linux-elf"

        if [ "$GCCVER" -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
        if [ "$GCCVER" -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then

-            OUT="linux-pentium"
+           options="$options -march=pentium"

           fi
           if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then
           fi
           if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then

-            OUT="linux-ppro"
+           options="$options -march=pentiumpro"

           fi
           if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then
           fi
           if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then

-            OUT="linux-k6"
+           options="$options -march=k6"

           fi
         fi ;;
   *-*-linux1) OUT="linux-aout" ;;
           fi
         fi ;;
   *-*-linux1) OUT="linux-aout" ;;

-  sun4u*-*-solaris2)
+  *-*-linux2) OUT="linux-generic32" ;;
+  sun4[uv]*-*-solaris2)

        OUT="solaris-sparcv9-$CC"
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`
        OUT="solaris-sparcv9-$CC"
        ISA64=`(isalist) 2>/dev/null | grep sparcv9`

-       if [ "$ISA64" != "" ]; then
+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then

            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 [ "$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."
                  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
                fi
            elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
                # $GCC_ARCH denotes default ABI chosen by compiler driver


@@ -613,65 +713,74 @@ 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*."
                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."
                  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*."
                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."
                  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
                fi
            fi
        fi

+       if [ "$ISA64" != "" -a "$KERNEL_BITS" = "64" ]; then
+           OUT="solaris64-sparcv9-$CC"
+       fi

        ;;
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
        ;;
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;

-  *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
-  *-*-sunos4) OUT="sunos-$CC" ;;
-  alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-  sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
-  ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
-  *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
-  *-freebsd[1-2]*) OUT="FreeBSD" ;;
-  *86*-*-netbsd) OUT="NetBSD-x86" ;;
-  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
-  *-*-netbsd) OUT="NetBSD-sparc" ;;
-  alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-  *86*-*-openbsd) OUT="OpenBSD-i386" ;;
-  m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
-  m88k*-*-openbsd) OUT="OpenBSD-m88k" ;;
-  mips*-*-openbsd) OUT="OpenBSD-mips" ;;
-  pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
-  powerpc*-*-openbsd) OUT="OpenBSD-powerpc" ;;
-  sparc64*-*-openbsd) OUT="OpenBSD-sparc64" ;;
-  sparc*-*-openbsd) OUT="OpenBSD-sparc" ;;
-  vax*-*-openbsd) OUT="OpenBSD-vax" ;;
-  hppa*-*-openbsd) OUT="OpenBSD-hppa" ;;
-  *-*-openbsd) OUT="OpenBSD" ;;
-  *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
-  *-*-osf) OUT="alphaold-cc" ;;
-  *-*-tru64) OUT="alpha-cc" ;;
-  *-*-OpenUNIX*)
+  *86*-*-solaris2)
+       ISA64=`(isalist) 2>/dev/null | grep amd64`
+       if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
+           OUT="solaris64-x86_64-$CC"
+       else
+           OUT="solaris-x86-$CC"
+           if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
+               options="$options no-sse2"
+           fi
+       fi
+       ;;
+  *-*-sunos4)          OUT="sunos-$CC" ;;
+
+  *86*-*-bsdi4)                OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
+  alpha*-*-*bsd*)      OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
+  powerpc64-*-*bsd*)   OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
+  sparc64-*-*bsd*)     OUT="BSD-sparc64" ;;
+  ia64-*-*bsd*)                OUT="BSD-ia64" ;;
+  amd64-*-*bsd*)       OUT="BSD-x86_64" ;;
+  *86*-*-*bsd*)                # mimic ld behaviour when it's looking for libc...
+                       if [ -L /usr/lib/libc.so ]; then        # [Free|Net]BSD
+                           libc=/usr/lib/libc.so
+                       else                                    # OpenBSD
+                           # ld searches for highest libc.so.* and so do we
+                           libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null`
+                       fi
+                       case "`(file -L $libc) 2>/dev/null`" in
+                       *ELF*)  OUT="BSD-x86-elf" ;;
+                       *)      OUT="BSD-x86"; options="$options no-sse2" ;;
+                       esac ;;
+  *-*-*bsd*)           OUT="BSD-generic32" ;;
+
+  *-*-osf)             OUT="osf1-alpha-cc" ;;
+  *-*-tru64)           OUT="tru64-alpha-cc" ;;
+  *-*-[Uu]nix[Ww]are7)

        if [ "$CC" = "gcc" ]; then
        if [ "$CC" = "gcc" ]; then

-         OUT="OpenUNIX-8-gcc" 
+         OUT="unixware-7-gcc" ; options="$options no-sse2"

        else    
        else    

-         OUT="OpenUNIX-8" 
+         OUT="unixware-7" ; options="$options no-sse2 -D__i386__"

        fi
        ;;
        fi
        ;;

-  *-*-unixware7) OUT="unixware-7" ;;
-  *-*-UnixWare7) OUT="unixware-7" ;;
-  *-*-Unixware7) OUT="unixware-7" ;;
-  *-*-unixware20*) OUT="unixware-2.0" ;;
-  *-*-unixware21*) OUT="unixware-2.1" ;;
-  *-*-UnixWare20*) OUT="unixware-2.0" ;;
-  *-*-UnixWare21*) OUT="unixware-2.1" ;;
-  *-*-Unixware20*) OUT="unixware-2.0" ;;
-  *-*-Unixware21*) OUT="unixware-2.1" ;;
+  *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 no-sha512" ;;
+  *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 no-sha512" ;;
+  *-*-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" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;


@@ -679,70 +788,67 @@ EOF
        if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
            OUT="hpux64-parisc2-gcc"
        fi
        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=`(getconf KERNEL_BITS) 2>/dev/null`

        KERNEL_BITS=${KERNEL_BITS:-32}
        CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
        CPU_VERSION=${CPU_VERSION:-0}
        # See <sys/unistd.h> for further info on CPU_VERSION.
        if   [ $CPU_VERSION -ge 768 ]; then     # IA-64 CPU
        KERNEL_BITS=${KERNEL_BITS:-32}
        CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
        CPU_VERSION=${CPU_VERSION:-0}
        # See <sys/unistd.h> for further info on CPU_VERSION.
        if   [ $CPU_VERSION -ge 768 ]; then     # IA-64 CPU

-            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
-               echo "         You have about 5 seconds to press Ctrl-C to abort."
-               (stty -icanon min 0 time 50; read waste) < /dev/tty
-            fi
-            OUT="hpux64-ia64-cc"
+            if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
+               OUT="hpux64-ia64-cc"
+             else
+               OUT="hpux-ia64-cc"
+             fi

        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
             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*."
        elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
             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*."

-               if [ "$TEST" = "false" ]; then
+               if [ "$TEST" = "false" -a -t 1 ]; then

                  echo "         You have about 5 seconds to press Ctrl-C to abort."
                  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
                fi
             fi
        elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU

-            OUT="hpux-parisc-${CC}
+            OUT="hpux-parisc-${CC}"

        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU
        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU

-            OUT="hpux-parisc-${CC}
+            OUT="hpux-parisc-${CC}"

        else                                    # Motorola(?) CPU
             OUT="hpux-$CC"
        fi
        options="$options -D_REENTRANT" ;;
   *-hpux)      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`
+  *-aix)
+       [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`

        KERNEL_BITS=${KERNEL_BITS:-32}
        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
+       OBJECT_MODE=${OBJECT_MODE:-32}
+       if [ "$CC" = "gcc" ]; then
+           OUT="aix-gcc"
+          if [ $OBJECT_MODE -eq 64 ]; then
+            echo 'Your $OBJECT_MODE was found to be set to 64'
+            OUT="aix64-gcc"
+          fi
+       elif [ $OBJECT_MODE -eq 64 ]; then
+           echo 'Your $OBJECT_MODE was found to be set to 64' 

            OUT="aix64-cc"
            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
+       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

-       elif [ "$CC" = "gcc ]; then
-           OUT="aix-gcc"

        fi
        fi

-       ;;
-  *-aix)
-       if [ "$CC" = "gcc" ]; then
-           OUT="aix-gcc"
+       if (lsattr -E -O -l `lsdev -c processor|awk '{print$1;exit}'` | grep -i powerpc) >/dev/null 2>&1; then
+           :   # this applies even to Power3 and later, as they return PowerPC_POWER[345]

        else
        else

-           OUT="aix43-cc"
+           options="$options no-asm"

        fi
        ;;
   # these are all covered by the catchall below
        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" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
   *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;


@@ -750,10 +856,15 @@ EOF
   t3e-cray-unicosmk) OUT="cray-t3e" ;;
   j90-cray-unicos) OUT="cray-j90" ;;
   nsr-tandem-nsk) OUT="tandem-c89" ;;
   t3e-cray-unicosmk) OUT="cray-t3e" ;;
   j90-cray-unicos) OUT="cray-j90" ;;
   nsr-tandem-nsk) OUT="tandem-c89" ;;

+  beos-*) OUT="$GUESSOS" ;;
+  x86pc-*-qnx6) OUT="QNX6-i386" ;;
+  *-*-qnx6) OUT="QNX6" ;;
+  x86-*-android|i?86-*-android) OUT="android-x86" ;;
+  armv[7-9]*-*-android) OUT="android-armv7" ;;

   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 

-# NB: This atalla support has been superceded by the ENGINE support
+# NB: This atalla support has been superseded by the ENGINE support

 # That contains its own header and definitions anyway. Support can
 # be enabled or disabled on any supported platform without external
 # headers, eg. by adding the "hw-atalla" switch to ./config or
 # That contains its own header and definitions anyway. Support can
 # be enabled or disabled on any supported platform without external
 # headers, eg. by adding the "hw-atalla" switch to ./config or


@@ -765,12 +876,23 @@ esac
 #  options="$options -DATALLA"
 #fi
 
 #  options="$options -DATALLA"
 #fi
 

-# gcc < 2.8 does not support -mcpu=ultrasparc
+if [ -n "$CONFIG_OPTIONS" ]; then
+  options="$options $CONFIG_OPTIONS"
+fi
+
+if expr "$options" : '.*no\-asm' > /dev/null; then :; else
+  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
+  grep \\--noexecstack >/dev/null && \
+  options="$options -Wa,--noexecstack"
+fi
+
+# gcc < 2.8 does not support -march=ultrasparc

 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
 then

-  echo "WARNING! Do consider upgrading to gcc-2.8 or later."
+  echo "WARNING! Falling down to 'solaris-sparcv8-gcc'."
+  echo "         Upgrade to gcc-2.8 or later."

   sleep 5
   sleep 5

-  OUT=solaris-sparcv9-gcc27
+  OUT=solaris-sparcv8-gcc

 fi
 if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
 then
 fi
 if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
 then


@@ -784,7 +906,7 @@ case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
   i386-*) options="$options 386" ;;
 esac
 

-for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha
+for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha

 do
   if [ ! -d crypto/$i ]
   then
 do
   if [ ! -d crypto/$i ]
   then


@@ -819,8 +941,8 @@ fi
 
 if [ ".$PERL" = . ] ; then
        for i in . `echo $PATH | sed 's/:/ /g'`; do
 
 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
                        break;
                fi;
        done


@@ -828,9 +950,9 @@ fi
 
 if [ ".$PERL" = . ] ; then
        for i in . `echo $PATH | sed 's/:/ /g'`; do
 
 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;
                                break;
                        fi;
                fi;