linux-parisc update.

[openssl.git] / config

diff --git a/config b/config
index 9d6788708f089c697674eaabbb64d464ebecb15a..5a3ee880edcf181a2d87e9812e961cc4b19220c7 100755 (executable)
--- a/config
+++ b/config
@@ -491,13 +491,13 @@ case "$GUESSOS" in
        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}
-       if [ $CPU -ge 5000 ]; then
-               options="$options -mips4"
-       else
-               options="$options -mips3"
-       fi
+       #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | 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"
        ;;
   mips4-sgi-irix64)
@@ -507,13 +507,13 @@ case "$GUESSOS" in
          echo "         You have about 5 seconds to press Ctrl-C to abort."
          (stty -icanon min 0 time 50; read waste) < /dev/tty
        fi
-        CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
-        CPU=${CPU:-0}
-        if [ $CPU -ge 5000 ]; then
-                options="$options -mips4"
-        else
-                options="$options -mips3"
-        fi
+        #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | 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)
@@ -578,9 +578,11 @@ EOF
        sun4d)  OUT="linux-sparcv8" ;;
        *)      OUT="linux-sparcv7" ;;
        esac ;;
-  parisc-*-linux2)
-        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
-       CPUSCHEDULE=`awk '/^cpu.[       ]: PA/{print substr($3,3)}' /proc/cpuinfo`
+  parisc*-*-linux2)
+       # 64-bit builds under parisc64 linux are not supported and
+       # compiler is expected to generate 32-bit objects...
+       CPUARCH=`awk '/cpu family/{print substr($5,1,3); exit(0);}' /proc/cpuinfo`
+       CPUSCHEDULE=`awk '/^cpu.[       ]*: PA/{print substr($3,3); exit(0);}' /proc/cpuinfo`
 
        # ??TODO ??  Model transformations
        # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
@@ -593,7 +595,7 @@ EOF
        #         PA8500   -> 8000   (2.0)
        #         PA8600   -> 8000   (2.0)
 
-       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'`
+       CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'`
        # Finish Model transformations
 
        options="$options -mschedule=$CPUSCHEDULE -march=$CPUARCH"