From: Ulf Möller <ulf@openssl.org>
Date: Wed, 14 Feb 2001 00:14:09 +0000 (+0000)
Subject: IRIX bugfix
X-Git-Tag: OpenSSL_0_9_6a-beta1~32^2~25
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=720235eeec6de9d0ce463d22b5a1732cdb24d436

IRIX bugfix
---

diff --git a/CHANGES b/CHANGES
index 97ba972b39..94e354b81b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,10 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Fix CPU detection on Irix 6.x.
+     [Kurt Hockenbury <khockenb@stevens-tech.edu> and
+      "Bruce W. Forsberg" <bruce.forsberg@baesystems.com>]
+
   *) New function OCSP_parse_url(). This splits up a URL into its host,
      port and path components: primarily to parse OCSP URLs. New -url
      option to ocsp utility.
diff --git a/config b/config
index f2b92e3e4b..c97655daaa 100755
--- a/config
+++ b/config
@@ -401,10 +401,16 @@ case "$GUESSOS" in
 	;;
   mips4-sgi-irix64)
 	echo "WARNING! If you wish to build 64-bit library, then you have to"
-	echo "         invoke './Configre irix64-mips4-$CC' *manually*."
+	echo "         invoke './Configure irix64-mips4-$CC' *manually*."
 	echo "         Type return if you want to continue, Ctrl-C to abort."
 	read waste < /dev/tty
-	options="$options -mips4"
+        CPU=`(hinv -t cpu) 2>/dev/null | 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)