Remove redundant declaration.
[openssl.git] / config
diff --git a/config b/config
index 21202f3..79ce83a 100755 (executable)
--- a/config
+++ b/config
@@ -74,34 +74,27 @@ if [ "x$XREL" != "x" ]; then
                echo "whatever-whatever-sco5"; exit 0
                ;;
            4.2MP)
-               if [ "x$VERSION" = "x2.01" ]; then
-                   echo "${MACHINE}-whatever-unixware201"; exit 0
-               elif [ "x$VERSION" = "x2.02" ]; then
-                   echo "${MACHINE}-whatever-unixware202"; exit 0
-               elif [ "x$VERSION" = "x2.03" ]; then
-                   echo "${MACHINE}-whatever-unixware203"; exit 0
-               elif [ "x$VERSION" = "x2.1.1" ]; then
-                   echo "${MACHINE}-whatever-unixware211"; exit 0
-               elif [ "x$VERSION" = "x2.1.2" ]; then
-                   echo "${MACHINE}-whatever-unixware212"; exit 0
-               elif [ "x$VERSION" = "x2.1.3" ]; then
-                   echo "${MACHINE}-whatever-unixware213"; exit 0
-               else
-                   echo "${MACHINE}-whatever-unixware2"; exit 0
-               fi
+               case "x${VERSION}" in
+                   x2.0*) echo "whatever-whatever-unixware20"; exit 0 ;;
+                   x2.1*) echo "whatever-whatever-unixware21"; exit 0 ;;
+                   x2*)   echo "whatever-whatever-unixware2";  exit 0 ;;
+               esac
                ;;
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;
-           OpenUNIX)
-               if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x8" ]; then
-                   echo "${MACHINE}-unknown-OpenUNIX${VERSION}"; exit 0
-               fi
-               ;;
            5)
-               if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then
-                   echo "${MACHINE}-sco-unixware7"; exit 0
-               fi
+               case "x${VERSION}" in
+                   # We hardcode i586 in place of ${MACHINE} for the
+                   # following reason. The catch is that even though Pentium
+                   # is minimum requirement for platforms in question,
+                   # ${MACHINE} gets always assigned to i386. Now, problem
+                   # 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 ;;
+               esac
                ;;
        esac
     fi
@@ -196,7 +189,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-bsdi"; exit 0
        ;;
 
-    FreeBSD:*)
+    FreeBSD:*:*:*386*)
         VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'`
         MACH=`sysctl -n hw.model`
         ARCH='whatever'
@@ -205,7 +198,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
            *486*       ) MACH="i486"     ;;
            Pentium\ II*) MACH="i686"     ;;
            Pentium*    ) MACH="i586"     ;;
-           Alpha*      ) MACH="alpha"    ;;
            *           ) MACH="$MACHINE" ;;
         esac
         case ${MACH} in
@@ -214,6 +206,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
         ;;
 
+    FreeBSD:*)
+       echo "${MACHINE}-whatever-freebsd"; exit 0
+       ;;
+
     NetBSD:*:*:*386*)
         echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
        ;;
@@ -246,10 +242,13 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        ;;
 
     QNX:*)
-       case "$VERSION" in
+       case "$RELEASE" in
            4*)
                echo "${MACHINE}-whatever-qnx4"
                ;;
+           6*)
+               echo "${MACHINE}-whatever-qnx6"
+               ;;
            *)
                echo "${MACHINE}-whatever-qnx"
                ;;
@@ -329,6 +328,29 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "mips-sony-newsos4"; exit 0;
        ;;
 
+    CYGWIN*)
+       case "$RELEASE" in
+           [bB]*|1.0|1.[12].*)
+               echo "${MACHINE}-whatever-cygwin_pre1.3"
+               ;;
+           *)
+               echo "${MACHINE}-whatever-cygwin"
+               ;;
+       esac
+       exit 0
+       ;;
+
+    *"CRAY T3E")
+       echo "t3e-cray-unicosmk"; exit 0;
+       ;;
+
+    *CRAY*)
+       echo "j90-cray-unicos"; exit 0;
+       ;;
+
+    NONSTOP_KERNEL*)
+       echo "nsr-tandem-nsk"; exit 0;
+       ;;
 esac
 
 #
@@ -368,18 +390,33 @@ exit 0
 
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
-GCCVER=`(gcc --version) 2>/dev/null`
+GCCVER=`(gcc -dumpversion) 2>/dev/null`
 if [ "$GCCVER" != "" ]; then
   CC=gcc
-  # then strip off whatever prefix Cygnus prepends the number with...
-  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
+  # 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
 fi
 GCCVER=${GCCVER:-0}
-
+if [ "$SYSTEM" = "HP-UX" ];then
+  # By default gcc is a ILP32 compiler (with long long == 64).
+  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
+      GCC_BITS="64"
+    fi
+  fi
+fi
 if [ "$SYSTEM" = "SunOS" ]; then
   if [ $GCCVER -ge 30 ]; then
     # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
@@ -420,6 +457,10 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
   fi
 fi
 
+if [ "${SYSTEM}" = "AIX" ]; then       # favor vendor cc over gcc
+    (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
+fi
+
 CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS 
@@ -432,7 +473,7 @@ echo Operating system: $GUESSOS
 # more time that I want to waste at the moment
 case "$GUESSOS" in
   mips2-sgi-irix)
-       CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+       CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
        CPU=${CPU:-0}
        if [ $CPU -ge 4000 ]; then
                options="$options -mips2"
@@ -440,7 +481,7 @@ case "$GUESSOS" in
        OUT="irix-$CC"
        ;;
   mips3-sgi-irix)
-       CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+       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"
@@ -456,7 +497,7 @@ case "$GUESSOS" in
          echo "         You have about 5 seconds to press Ctrl-C to abort."
          (stty -icanon min 0 time 50; read waste) < /dev/tty
        fi
-        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
+        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"
@@ -495,6 +536,10 @@ 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" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -502,12 +547,13 @@ EOF
   ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
   i386-apple-darwin*) OUT="darwin-i386-cc" ;;
   sparc64-*-linux2)
-       #Before we can uncomment following lines we have to wait at least
-       #till 64-bit glibc for SPARC is operational:-(
-       #echo "WARNING! If you wish to build 64-bit library, then you have to"
-       #echo "         invoke './Configure linux64-sparcv9' *manually*."
-       #echo "         Type return if you want to continue, Ctrl-C to abort."
-       #read waste < /dev/tty
+       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
+         echo "          You have about 5 seconds to press Ctrl-C to abort."
+         (stty -icanon min 0 time 50; read waste) < /dev/tty
+       fi
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)
        KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
@@ -517,8 +563,30 @@ EOF
        sun4d)  OUT="linux-sparcv8" ;;
        *)      OUT="linux-sparcv7" ;;
        esac ;;
+  parisc-*-linux2)
+        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
+       CPUSCHEDULE=`awk '/^cpu.[       ]: PA/{print substr($3,3)}' /proc/cpuinfo`
+
+       # ??TODO ??  Model transformations
+       # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
+       #    assuming no further arch. identification will ever be used by GCC.
+       # 1. I'm most concerned about whether is a 7300LC is closer to a 7100 versus a 7100LC.
+       # 2. The variant 64-bit processors cause concern should GCC support explicit schedulers
+       #    for these chips in the future.
+       #         PA7300LC -> 7100LC (1.1)
+       #         PA8200   -> 8000   (2.0)
+       #         PA8500   -> 8000   (2.0)
+       #         PA8600   -> 8000   (2.0)
+
+       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'`
+       # 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" ;;
+  x86_64-*-linux?) OUT="linux-x86_64" ;;
   *-*-linux2) OUT="linux-elf"
        if [ "$GCCVER" -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
@@ -572,19 +640,35 @@ EOF
   *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" ;;
-  *86*-*-openbsd) OUT="OpenBSD-x86" ;;
   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" ;;
-  *-*-OpenUNIX8*) OUT="OpenUNIX-8" ;;
+  *-*-OpenUNIX*)
+       if [ "$CC" = "gcc" ]; then
+         OUT="OpenUNIX-8-gcc" 
+       else    
+         OUT="OpenUNIX-8" 
+       fi
+       ;;
   *-*-unixware7) OUT="unixware-7" ;;
   *-*-UnixWare7) OUT="unixware-7" ;;
   *-*-Unixware7) OUT="unixware-7" ;;
@@ -598,16 +682,27 @@ EOF
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
   *-hpux1*)
-       OUT="hpux-parisc-$CC"
+       if [ $CC = "gcc" ];
+       then
+         if [ $GCC_BITS = "64" ]; then
+           OUT="hpux64-parisc-gcc"
+         else
+           OUT="hpux-parisc-gcc"
+         fi
+       else
+         OUT="hpux-parisc-$CC"
+       fi
        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
-            echo "NOTICE! 64-bit is the only ABI currently operational on HP-UXi."
-            echo "        Post request to openssl-dev@openssl.org for 32-bit support."
+            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"
@@ -636,6 +731,11 @@ EOF
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
+  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+  *-*-cygwin) OUT="Cygwin" ;;
+  t3e-cray-unicosmk) OUT="cray-t3e" ;;
+  j90-cray-unicos) OUT="cray-j90" ;;
+  nsr-tandem-nsk) OUT="tandem-c89" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
@@ -670,7 +770,7 @@ case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
-for i in bf cast des dh dsa ec hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
+for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha
 do
   if [ ! -d crypto/$i ]
   then