From 83116daccf608d46044103a51127aa954ed1c615 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Fri, 5 Oct 2001 06:34:14 +0000
Subject: [PATCH] 2001-10-05 Ben Elliston <bje@redhat.com>
* config.guess: Add "SKA40" as a machine type for NCR SysV UNIX.
From Rudi Heitbaum <rheitbaum@tattersalls.com.au>.
2001-10-05 Rodney Brown <rbrown64@csc.com.au>
* config.guess (9000/[34678]??:HP-UX:*:*): Unconditionally try
/usr/bin/getconf which is available on HP-UX 10.20. Reindent.
---
ChangeLog | 10 ++++++++++
config.guess | 26 ++++++++++++--------------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c52f0b9..5bffe1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-05 Ben Elliston <bje@redhat.com>
+
+ * config.guess: Add "SKA40" as a machine type for NCR SysV UNIX.
+ From Rudi Heitbaum <rheitbaum@tattersalls.com.au>.
+
+2001-10-05 Rodney Brown <rbrown64@csc.com.au>
+
+ * config.guess (9000/[34678]??:HP-UX:*:*): Unconditionally try
+ /usr/bin/getconf which is available on HP-UX 10.20. Reindent.
+
2001-10-04 Ben Elliston <bje@redhat.com>
* config.sub: Handle viac3 as an i586-class CPU.
diff --git a/config.guess b/config.guess
index f23d1c6..297e5c3 100755
--- a/config.guess
+++ b/config.guess
@@ -548,10 +548,8 @@ EOF
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- case "${HPUX_REV}" in
- 11.[0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -560,13 +558,13 @@ EOF
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
- fi ;;
- esac
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -599,10 +597,10 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
+ fi ;;
esac
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
@@ -949,7 +947,7 @@ EOF
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`