util/process_docs.pl: Add more debugging output

[openssl.git] / config

diff --git a/config b/config
index ae349ecb0c625187f24baf7a5e7493f5a6081dd2..dfdca4d95589cf2e75acb81e79618d4005f21f16 100755 (executable)
--- a/config
+++ b/config
@@ -134,10 +134,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        esac
        ;;
 
-    IRIX:5.*)
-       echo "mips2-sgi-irix"; exit 0
-       ;;
-
     IRIX:6.*)
        echo "mips3-sgi-irix"; exit 0
        ;;
@@ -202,6 +198,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-freebsd"; exit 0
        ;;
 
+    Haiku:*)
+       echo "${MACHINE}-whatever-haiku"; exit 0
+       ;;
+
     NetBSD:*:*:*386*)
         echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
        ;;
@@ -261,6 +261,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
            Power*)
                echo "ppc-apple-darwin${VERSION}"
                ;;
+           x86_64)
+               echo "x86_64-apple-darwin${VERSION}"
+               ;;
            *)
                echo "i686-apple-darwin${VERSION}"
                ;;
@@ -457,14 +460,6 @@ case "$GUESSOS" in
   uClinux*)
     OUT=uClinux-dist
        ;;
-  mips2-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 4000 ]; then
-               options="$options -mips2"
-       fi
-       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}
@@ -480,7 +475,7 @@ case "$GUESSOS" in
        echo "         invoke '$THERE/Configure irix64-mips4-$CC' *manually*."
        if [ "$TEST" = "false" -a -t 1 ]; then
          echo "         You have about 5 seconds to press Ctrl-C to abort."
-         (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+         (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
        fi
         #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
         #CPU=${CPU:-0}
@@ -499,7 +494,7 @@ case "$GUESSOS" in
            echo "         invoke '$THERE/Configure darwin64-ppc-cc' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
              echo "         You have about 5 seconds to press Ctrl-C to abort."
-             (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+             (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
        if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
@@ -511,7 +506,7 @@ case "$GUESSOS" in
        ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
        if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
            echo "WARNING! If you wish to build 64-bit library, then you have to"
-           echo "         invoke '$THERE/Configure darwin64-x86_64-cc $options' *manually*."
+           echo "         invoke 'KERNEL_BITS=64 $THERE/config $options'."
            if [ "$TEST" = "false" -a -t 1 ]; then
              echo "         You have about 5 seconds to press Ctrl-C to abort."
              # The stty technique used elsewhere doesn't work on
@@ -524,6 +519,22 @@ case "$GUESSOS" in
        else
            OUT="darwin-i386-cc"
        fi ;;
+  x86_64-apple-darwin*)
+       if [ -z "$KERNEL_BITS" ]; then
+           echo "WARNING! If you wish to build 32-bit library, then you have to"
+           echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
+           if [ "$TEST" = "false" -a -t 1 ]; then
+             echo "         You have about 5 seconds to press Ctrl-C to abort."
+             # The stty technique used elsewhere doesn't work on
+             # MacOS. At least, right now on this Mac.
+             sleep 5
+           fi
+       fi
+       if [ "$KERNEL_BITS" = "32" ]; then
+           OUT="darwin-i386-cc"
+       else
+           OUT="darwin64-x86_64-cc"
+       fi ;;
   armv6+7-*-iphoneos)
        options="$options -arch%20armv6 -arch%20armv7"
        OUT="iphoneos-cross" ;;
@@ -552,7 +563,7 @@ case "$GUESSOS" in
            echo "         invoke '$THERE/Configure linux-ppc64' *manually*."
            if [ "$TEST" = "false" -a -t 1 ]; then
                echo "         You have about 5 seconds to press Ctrl-C to abort."
-               (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+               (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
            fi
        fi
        if [ "$KERNEL_BITS" = "64" ]; then
@@ -569,7 +580,7 @@ case "$GUESSOS" in
        echo "         invoke '$THERE/Configure linux64-mips64' *manually*."
        if [ "$TEST" = "false" -a -t 1 ]; then
            echo "         You have about 5 seconds to press Ctrl-C to abort."
-           (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+           (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
        fi
        OUT="linux-mips64"
        ;;
@@ -586,7 +597,7 @@ case "$GUESSOS" in
        echo "         invoke '$THERE/Configure linux64-sparcv9' *manually*."
        if [ "$TEST" = "false" -a -t 1 ]; then
          echo "          You have about 5 seconds to press Ctrl-C to abort."
-         (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+         (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
        fi
        OUT="linux-sparcv9" ;;
   sparc-*-linux2)
@@ -634,7 +645,7 @@ case "$GUESSOS" in
        #  echo "         have to invoke './Configure linux32-s390x' *manually*."
        #  if [ "$TEST" = "false" -a -t -1 ]; then
        #    echo "         You have about 5 seconds to press Ctrl-C to abort."
-       #    (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+       #    (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
        #  fi
        #fi
        OUT="linux64-s390x"
@@ -663,7 +674,7 @@ case "$GUESSOS" in
                echo "         invoke '$THERE/Configure solaris64-sparcv9-cc' *manually*."
                if [ "$TEST" = "false" -a -t 1 ]; then
                  echo "         You have about 5 seconds to press Ctrl-C to abort."
-                 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
                fi
            elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
                # $GCC_ARCH denotes default ABI chosen by compiler driver
@@ -675,7 +686,7 @@ case "$GUESSOS" in
                echo "         invoke '$THERE/Configure solaris-sparcv9-gcc' *manually*."
                if [ "$TEST" = "false" -a -t 1 ]; then
                  echo "         You have about 5 seconds to press Ctrl-C to abort."
-                 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
                fi
            elif [ "$GCC_ARCH" = "-m32" ]; then
                echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
@@ -683,7 +694,7 @@ case "$GUESSOS" in
                echo "        invoke '$THERE/Configure solaris64-sparcv9-gcc' *manually*."
                if [ "$TEST" = "false" -a -t 1 ]; then
                  echo "         You have about 5 seconds to press Ctrl-C to abort."
-                 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
                fi
            fi
        fi
@@ -724,6 +735,8 @@ case "$GUESSOS" in
                        *ELF*)  OUT="BSD-x86-elf" ;;
                        *)      OUT="BSD-x86"; options="$options no-sse2" ;;
                        esac ;;
+  x86_64-*-haiku)      OUT="haiku-x86_64" ;;
+  *-*-haiku)           OUT="haiku-x86" ;;
   *-*-*bsd*)           OUT="BSD-generic32" ;;
 
   *-*-osf)             OUT="osf1-alpha-cc" ;;
@@ -764,11 +777,16 @@ case "$GUESSOS" in
                echo "         invoke '$THERE/Configure hpux64-parisc2-cc' *manually*."
                if [ "$TEST" = "false" -a -t 1 ]; then
                  echo "         You have about 5 seconds to press Ctrl-C to abort."
-                 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
                fi
             fi
+            # PA-RISC 2.0 is no longer supported as separate 32-bit
+            # target. This is compensated for by run-time detection
+            # in most critical assembly modules and taking advantage
+            # of 2.0 architecture in PA-RISC 1.1 build.
+            OUT="hpux-parisc1_1-${CC}"
        elif [ $CPU_VERSION -ge 528 ]; then     # PA-RISC 1.1+ CPU
-            OUT="hpux-parisc-${CC}"
+            OUT="hpux-parisc1_1-${CC}"
        elif [ $CPU_VERSION -ge 523 ]; then     # PA-RISC 1.0 CPU
             OUT="hpux-parisc-${CC}"
        else                                    # Motorola(?) CPU
@@ -796,7 +814,7 @@ case "$GUESSOS" in
                echo "         invoke '$THERE/Configure aix64-cc' *manually*."
                if [ "$TEST" = "false" -a -t 1 ]; then
                    echo "         You have ~5 seconds to press Ctrl-C to abort."
-                   (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+                   (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
                fi
            fi
        fi