+45% RC4 performance boost on Intel EM64T core. Unrolled loop providing

[openssl.git] / config

diff --git a/config b/config
index a4a5bd0fbf3a4adeaf925b5967b9f48dfe4ec4a1..71ada7bbe1508ee7808587bb2075753bd853ea21 100755 (executable)
--- a/config
+++ b/config
@@ -442,7 +442,7 @@ if [ "$SYSTEM" = "SunOS" ]; then
        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"
@@ -638,7 +638,14 @@ case "$GUESSOS" in
   sun4m-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)    OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)    OUT="solaris-sparcv7-$CC" ;;
-  *86*-*-solaris2)     OUT="solaris-x86-$CC" ;;
+  *86*-*-solaris2)
+       ISA64=`(isalist) 2>/dev/null | grep amd64`
+       if [ "$ISA64" != "" ]; then
+           OUT="solaris64-x86_64-$CC"
+       else
+           OUT="solaris-x86-$CC"
+       fi
+       ;;
   *-*-sunos4)          OUT="sunos-$CC" ;;
 
   *86*-*-bsdi4)                OUT="bsdi-elf-gcc" ;;
@@ -647,8 +654,10 @@ case "$GUESSOS" in
   sparc64-*-*bsd*)     OUT="BSD-sparc64" ;;
   ia64-*-*bsd*)                OUT="BSD-ia64" ;;
   amd64-*-*bsd*)       OUT="BSD-x86_64" ;;
-  *86*-*-freebsd[3-9]*)        OUT="BSD-x86-elf" ;;
-  *86*-*-*bsd*)                OUT="BSD-x86" ;;
+  *86*-*-*bsd*)                case "`(file -L /usr/lib/libc.so.*) 2>/dev/null`" in
+                       *ELF*)  OUT="BSD-x86-elf" ;;
+                       *)      OUT="BSD-x86" ;;
+                       esac ;;
   *-*-*bsd*)           OUT="BSD-generic32" ;;
 
   *-*-osf)             OUT="osf1-alpha-cc" ;;
@@ -660,15 +669,9 @@ case "$GUESSOS" in
          OUT="OpenUNIX-8" 
        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]are7) OUT="unixware-7" ;;
+  *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0" ;;
+  *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1" ;;
   *-*-vos)
        options="$options no-threads no-shared no-asm no-dso"
        EXE=".pm"