* config.guess: Recognize Pentium under SCO.

diff --git a/ChangeLog b/ChangeLog
index 654d2f1f26bbed59f79751ec0ab349bf2eb7e7ae..33eab830a8b8c9ba79749966690a49d6b8cd6069 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 30 16:57:33 1995  Per Bothner  <bothner@wombat.gnu.ai.mit.edu>
+
+       * config.guess:  Recognize Pentium under SCO.
+       From Robert Lipe <robertl@arnet.com>.
+
 Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
        * configure.in (noconfigdirs): Disable target-libio on v810-*-*.

diff --git a/config.guess b/config.guess
index 01e853bc98f9f3509ca4b566c3b4cdff02eea94a..1948c5398b4875a40841b29ef3544272c18c8543 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -219,7 +219,7 @@ EOF
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/7?? | 9000/8?7 ) HP_ARCH=hppa1.1 ;;
+           9000/7?? | 9000/8?[79] ) HP_ARCH=hppa1.1 ;;
            9000/8?? )            HP_ARCH=hppa1.0 ;;
        esac
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -255,13 +255,13 @@ EOF
        rm -f dummy.c dummy
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo hppa1.1-hp-bsd
        exit 0 ;;
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
-    hp7??:OSF1:*:* | hp8?7:OSF1:*:* )
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
        exit 0 ;;
     hp8??:OSF1:*:*)
@@ -320,20 +320,18 @@ EOF
        # first see if it will tell us.
        ld_help_string=`ld --help 2>&1`
        if echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
-         echo "${UNAME_MACHINE}-unknown-linux"
+         echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
        elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
-         echo "${UNAME_MACHINE}-unknown-linuxaout"
+         echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
        elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
-         echo "${UNAME_MACHINE}-unknown-linuxcoff"
+         echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
+       elif test "${UNAME_MACHINE}" = "alpha" ; then
+         echo alpha-unknown-linux ; exit 0
        else
          # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
          # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-         if test -d /usr/lib/ldscripts/. ; then
-           :
-         else
-           echo "${UNAME_MACHINE}-unknown-linuxoldld"
-           exit 0
-         fi
+         test ! -d /usr/lib/ldscripts/. \
+           && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
          # Determine whether the default compiler is a.out or elf
          cat >dummy.c <<EOF
 main(argc, argv)
@@ -370,6 +368,8 @@ EOF
        elif /bin/uname -X 2>/dev/null >/dev/null ; then
                UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
                (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+               (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+                       && UNAME_MACHINE=i586
                echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
        else
                echo ${UNAME_MACHINE}-unknown-sysv32