0.9.6a-beta1 works for solaris64-sparcv9-cc.

[oweals/openssl.git] / config

diff --git a/config b/config
index 8e7e39afcab52025fc6d926532f43f01ca4f588e..535573469b6450b40bd448a594208050abdae785 100755 (executable)
--- a/config
+++ b/config
@@ -393,10 +393,16 @@ case "$GUESSOS" in
        ;;
   mips4-sgi-irix64)
        echo "WARNING! If you wish to build 64-bit library, then you have to"
-       echo "         invoke './Configre irix64-mips4-$CC' *manually*."
-       echo "         Type Ctrl-C if you don't want to continue."
+       echo "         invoke './Configure irix64-mips4-$CC' *manually*."
+       echo "         Type return if you want to continue, Ctrl-C to abort."
        read waste < /dev/tty
-       options="$options -mips4"
+        CPU=`(hinv -t cpu) 2>/dev/null | 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)
@@ -413,22 +419,7 @@ case "$GUESSOS" in
            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
-       ;;
+  mips-*-linux?) OUT="linux-mips" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   m68k-*-linux*) OUT="linux-m68k" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -438,11 +429,11 @@ EOF
        #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 Ctrl-C if you don't want to continue."
+       #echo "         Type return if you want to continue, Ctrl-C to abort."
        #read waste < /dev/tty
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)
-       KARCH=`awk '/type/{print$3}' /proc/cpuinfo`
+       KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
        case ${KARCH:-sun4} in
        sun4u*) OUT="linux-sparcv9" ;;
        sun4m)  OUT="linux-sparcv8" ;;
@@ -450,6 +441,7 @@ EOF
        *)      OUT="linux-sparcv7" ;;
        esac ;;
   arm*-*-linux2) OUT="linux-elf-arm" ;;
+  s390-*-linux2) OUT="linux-s390" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4u*-*-solaris2)
@@ -457,7 +449,7 @@ EOF
        if [ "$ISA64" != "" -a "$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*."
-               echo "         Type Ctrl-C if you don't want to continue."
+               echo "         Type return if you want to continue, Ctrl-C to abort."
                read waste < /dev/tty
        fi
        OUT="solaris-sparcv9-$CC" ;;
@@ -497,17 +489,11 @@ EOF
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
-# NB: This atalla support has been superceded 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
-# perl Configure
-#
 # See whether we can compile Atalla support
-#if [ -f /usr/include/atasi.h ]
-#then
-#  options="$options -DATALLA"
-#fi
+if [ -f /usr/include/atasi.h ]
+then
+  options="$options -DATALLA"
+fi
 
 # gcc < 2.8 does not support -mcpu=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]