Remove CPU detect for IRIX targets. Performance gain is less than 1%,

[openssl.git] / config

diff --git a/config b/config
index a0dc457c55899173c6682e9f3a45623bb2c7b9b8..b38935f9b8e5b3d015d21622c5467b6390dec6bb 100755 (executable)
--- a/config
+++ b/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
        ;;
@@ -482,13 +491,13 @@ 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)
@@ -498,13 +507,13 @@ 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 | 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 +547,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" ]; 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-ppc"
+       ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -661,8 +675,8 @@ EOF
   hppa*-*-openbsd) OUT="OpenBSD-hppa" ;;
   *-*-openbsd) OUT="OpenBSD" ;;
   *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
-  *-*-osf) OUT="alphaold-cc" ;;
-  *-*-tru64) OUT="alpha-cc" ;;
+  *-*-osf) OUT="osf1-alpha-cc" ;;
+  *-*-tru64) OUT="tru64-alpha-cc" ;;
   *-*-OpenUNIX*)
        if [ "$CC" = "gcc" ]; then
          OUT="OpenUNIX-8-gcc" 
@@ -679,6 +693,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" ;;
@@ -719,8 +737,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" ]; then
+                   echo "         You have ~5 seconds to press Ctrl-C to abort."
+                   (/bin/stty -icanon min 0 time 50; read waste) < /dev/tty
+               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" ;;
@@ -746,9 +784,10 @@ esac
 # gcc < 2.8 does not support -mcpu=ultrasparc
 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
-  OUT=solaris-sparcv9-gcc27
+  OUT=solaris-sparcv8-gcc
 fi
 if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
 then
@@ -797,8 +836,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
@@ -806,9 +845,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;