Fork my debug configuration into 32-bit and 64-bit versions.

[openssl.git] / config

diff --git a/config b/config
index bb76191d58713e4ad0711b346d0cb32e954b7808..d7c98813b11e17206aca094020dc40e2f6244023 100755 (executable)
--- a/config
+++ b/config
@@ -278,7 +278,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
                echo "ppc-apple-darwin${VERSION}"
                ;;
            *)
-               echo "i386-apple-darwin${VERSION}"
+               echo "i686-apple-darwin${VERSION}"
                ;;
        esac
        exit 0
@@ -536,7 +536,7 @@ case "$GUESSOS" in
            fi
        fi
        OUT="darwin-ppc-cc" ;;
-  i386-apple-darwin*)
+  i?86-apple-darwin*)
        ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
        if [ "$ISA64" = "1" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
@@ -612,9 +612,7 @@ case "$GUESSOS" in
        options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH"
        OUT="linux-generic32" ;;
   armv[1-3]*-*-linux2) OUT="linux-generic32" ;;
-  # -march=armv4t is expected to generate code binary compatible with
-  # vanilla armv4 but interoperable with armv4t.
-  arm*-*-linux2) OUT="linux-armv4"; options="$options -march=armv4t" ;;
+  arm*-*-linux2) OUT="linux-armv4" ;;
   sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
   sh*-*-linux2)  OUT="linux-generic32"; options="$options -DL_ENDIAN" ;;
   m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;