Continues NASM support. This might work now. Its still experimental but it

[openssl.git] / config

diff --git a/config b/config
index 075e0c24cdefcddf294cfab028e2c6c193383289..8a47ca102dea40a04948bab9a0f934c30fd92e7e 100755 (executable)
--- a/config
+++ b/config
@@ -114,18 +114,25 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-lynx-lynxos"; exit 0
        ;;
 
+    BSD/OS:4.*)  # BSD/OS always says 386
+       echo "i486-whatever-bsdi4"; exit 0
+       ;;
+
     BSD/386:*:*:*486*|BSD/OS:*:*:*:*486*)
-       echo "i486-whatever-bsdi"; exit 0
+        case `/sbin/sysctl -n hw.model` in
+           Pentium*)
+                echo "i586-whatever-bsdi"; exit 0
+                ;;
+            *)
+                echo "i386-whatever-bsdi"; exit 0
+                ;;
+            esac;
        ;;
 
     BSD/386:*|BSD/OS:*)
        echo "${MACHINE}-whatever-bsdi"; exit 0
        ;;
 
-    FreeBSD:3*:*:*)
-       echo "${MACHINE}-whatever-freebsd3"; exit 0
-       ;;
-
     FreeBSD:*:*:*386*)
         case `sysctl -n hw.model` in
            Pentium*)
@@ -201,8 +208,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-unknown-ultrix"; exit 0
        ;;
 
-    SINIX*)
-       echo "${MACHINE}-sni-sysv4"; exit 0
+    SINIX*|ReliantUNIX*)
+       echo "${MACHINE}-siemens-sysv4"; exit 0
+       ;;
+
+    POSIX-BC*)
+       echo "${MACHINE}-siemens-sysv4"; exit 0   # Here, $MACHINE == "BS2000"
        ;;
 
     machten:*)
@@ -235,6 +246,9 @@ fi
 # Now NeXT
 ISNEXT=`hostinfo 2>/dev/null`
 case "$ISNEXT" in
+    *'NeXT Mach 3.3'*)
+       echo "whatever-next-nextstep3.3"; exit 0
+       ;;
     *NeXT*)
        echo "whatever-next-nextstep"; exit 0
        ;;
@@ -286,9 +300,9 @@ else
   if [ "$SYSTEM" = "SunOS" ]
   then
    case `cc -V 2>&1` in
-    *4*) CC=sc4;;
-    *5*) CC=sc5;;
-    *) CC=cc;;
+    *4*) CC=cc;;
+    *5*) CC=cc;;
+    *) CC=sc3;;
    esac
   fi
 fi
@@ -304,14 +318,16 @@ echo Operating system: $GUESSOS
 case "$GUESSOS" in
   alpha-*-linux2) OUT="alpha-gcc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
+  mips-*-linux?) OUT="linux-mips" ;;
+  sparc-*-linux2) OUT="linux-sparc" ;;
+  sparc64-*-linux2) OUT="linux-sparc64" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;;
   sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
   *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
-  alpha*-*-freebsd3) OUT="FreeBSD-alpha" ;;
-  *-freebsd3) OUT="FreeBSD-elf" ;;
+  alpha*-*-freebsd) OUT="FreeBSD-alpha" ;;
   *-freebsd) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
@@ -320,9 +336,12 @@ case "$GUESSOS" in
   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
   *-*-openbsd) OUT="OpenBSD" ;;
+  *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
   *-*-osf) OUT="alpha-cc" ;;
   *-*-unixware*) OUT="unixware-2.0" ;;
-  *-sni-sysv4) OUT="SINIX" ;;
+  BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
+  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
+  *-siemens-sysv4) OUT="SINIX" ;;
   # these are all covered by the catchall below
   # *-hpux*) OUT="hpux-$CC" ;;
   # *-aix) OUT="aix-$CC" ;;
@@ -330,10 +349,36 @@ case "$GUESSOS" in
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
+# gcc < 2.8 does not support -mcpu=ultrasparc
+if [ "$OUT" = solaris-usparc-gcc ]
+then
+ GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`"
+ GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`"
+ echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x"
+ case "$GCCVERMAJOR" in
+   egcs*)
+     ;;
+   *)
+     if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ]
+     then
+       OUT=solaris-usparc-oldgcc
+     fi
+     ;;
+  esac
+fi
+
 case "$GUESSOS" in
   i386-*) options="$options 386" ;;
 esac
 
+for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
+do
+  if [ ! -d crypto/$i ]
+  then
+    options="$options no-$i"
+  fi
+done
+
 if [ -z "$OUT" ]; then
   OUT="$CC"
 fi