- (djm) Update config.guess and config.sub with latest versions (from

   ftp://ftp.gnu.org/gnu/config/) to allow configure on ia64-hpux.
   Suggested by Jason Mader <jason@ncac.gwu.edu>

1 files changed, 348 insertions, 247 deletions

diff --git a/config.guess b/config.guess
index b4faaedca..ba6616516 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-version='2000-05-30'
+timestamp='2001-04-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -32,30 +32,41 @@ version='2000-05-30'
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of this system.
+Output the configuration name of the system \`$me' is run on.
 
 Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
        echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
@@ -64,9 +75,7 @@ while test $# -gt 0 ; do
     - ) # Use stdin as input.
        break ;;
     -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
     * )
        break ;;
@@ -78,19 +87,30 @@ if test $# != 0; then
   exit 1
 fi
 
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
-  if test x"$HOST_CC" != x; then
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
-fi
 
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c
+        for c in cc gcc c89 ; do
+          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+          if test $? = 0 ; then
+             CC_FOR_BUILD="$c"; break
+          fi
+        done
+        rm -f $dummy.c $dummy.o $dummy.rel
+        if test x"$CC_FOR_BUILD" = x ; then
+          CC_FOR_BUILD=no_compiler_found
+        fi
+        ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
@@ -100,12 +120,9 @@ fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -119,7 +136,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # object file format.
         # Determine the machine/vendor (is the vendor relevant).
         case "${UNAME_MACHINE}" in
-            amiga) machine=m68k-cbm ;;
+            amiga) machine=m68k-unknown ;;
             arm32) machine=arm-unknown ;;
             atari*) machine=m68k-atari ;;
             sun3*) machine=m68k-sun ;;
@@ -129,16 +146,24 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
             ibmrt|romp-ibm) machine=romp-ibm ;;
             *) machine=${UNAME_MACHINE}-unknown ;;
         esac
-        # The Operating System including object format.
-        if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                | grep __ELF__ >/dev/null
-        then
-            # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-            # Return netbsd for either.  FIX?
-            os=netbsd
-        else
-            os=netbsdelf
-        fi
+        # The Operating System including object format, if it has switched
+        # to ELF recently, or will in the future.
+        case "${UNAME_MACHINE}" in
+            i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                        | grep __ELF__ >/dev/null
+                then
+                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                    # Return netbsd for either.  FIX?
+                    os=netbsd
+                else
+                    os=netbsdelf
+                fi
+                ;;
+            *)
+                os=netbsd
+                ;;
+        esac
         # The OS release
         release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
         # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -215,7 +240,7 @@ EOF
         echo alpha-dec-winnt3.5
         exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-cbm-sysv4
+        echo m68k-unknown-sysv4
         exit 0;;
     amiga:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -247,7 +272,7 @@ EOF
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
         exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
         exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -383,10 +408,13 @@ EOF
 EOF
         $CC_FOR_BUILD $dummy.c -o $dummy \
           && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-          && rm $dummy.c $dummy && exit 0
+          && rm -f $dummy.c $dummy && exit 0
         rm -f $dummy.c $dummy
         echo mips-mips-riscos${UNAME_RELEASE}
         exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+        echo powerpc-motorola-powermax
+        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
         exit 0 ;;
@@ -434,9 +462,17 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
         echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
         exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
         echo i386-ibm-aix
         exit 0 ;;
+    ia64:AIX:*:*)
+        if [ -x /usr/bin/oslevel ] ; then
+                IBM_REV=`/usr/bin/oslevel`
+        else
+                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+        fi
+        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+        exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                 sed 's/^                //' << EOF >$dummy.c
@@ -450,7 +486,7 @@ EOF
                         exit(0);
                         }
 EOF
-                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
                 rm -f $dummy.c $dummy
                 echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -459,9 +495,9 @@ EOF
                 echo rs6000-ibm-aix3.2
         fi
         exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-        if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                 IBM_ARCH=rs6000
         else
                 IBM_ARCH=powerpc
@@ -469,7 +505,7 @@ EOF
         if [ -x /usr/bin/oslevel ] ; then
                 IBM_REV=`/usr/bin/oslevel`
         else
-                IBM_REV=4.${UNAME_RELEASE}
+                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
         fi
         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
         exit 0 ;;
@@ -495,10 +531,28 @@ EOF
         echo m68k-hp-bsd4.4
         exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         case "${UNAME_MACHINE}" in
             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`
+                    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
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                        esac ;;
+                    esac
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
               sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -533,11 +587,16 @@ EOF
               }
 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 ;;
         esac
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
         exit 0 ;;
+    ia64:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+        echo ia64-hp-hpux${HPUX_REV}
+        exit 0 ;;
     3050*:HI-UX:*:*)
         sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
@@ -564,7 +623,7 @@ EOF
           exit (0);
         }
 EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
         rm -f $dummy.c $dummy
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
@@ -583,7 +642,7 @@ EOF
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
         exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
             echo ${UNAME_MACHINE}-unknown-osf1mk
         else
@@ -628,27 +687,28 @@ EOF
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
-    CRAY*T3E:*:*:*)
+    CRAY*T3D:*:*:*)
         echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
+    CRAY*T3E:*:*:*)
+        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY-2:*:*:*)
         echo cray2-cray-unicos
         exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
     hp300:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
         exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -669,6 +729,9 @@ EOF
     i*:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         exit 0 ;;
+    i*:PW*:*)
+        echo ${UNAME_MACHINE}-pc-pw32
+        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
         # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -687,58 +750,41 @@ EOF
     *:GNU:*:*)
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
         exit 0 ;;
-    *:Linux:*:*)
-
-        # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us. cd to the root directory to prevent
-        # problems with other programs or directories called `ld' in the path.
-        ld_help_string=`cd /; ld --help 2>&1`
-        ld_supported_emulations=`echo $ld_help_string \
-                         | sed -ne '/supported emulations:/!d
-                                    s/[         ][      ]*/ /g
-                                    s/.*supported emulations: *//
-                                    s/ .*//
-                                    p'`
-        case "$ld_supported_emulations" in
-          *ia64)
-                echo "${UNAME_MACHINE}-unknown-linux"
-                exit 0
-                ;;
-          i?86linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0
-                ;;
-          elf_i?86)
-                echo "${UNAME_MACHINE}-pc-linux"
-                exit 0
-                ;;
-          i?86coff)
-                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-                exit 0
-                ;;
-          sparclinux)
-                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-                exit 0
-                ;;
-          armlinux)
-                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-                exit 0
-                ;;
-          elf32arm*)
-                echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-                exit 0
-                ;;
-          armelf_linux*)
-                echo "${UNAME_MACHINE}-unknown-linux-gnu"
-                exit 0
-                ;;
-          m68klinux)
-                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-                exit 0
-                ;;
-          elf32ppc | elf32ppclinux)
-                # Determine Lib Version
-                cat >$dummy.c <<EOF
+    i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit 0 ;;
+    arm*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    ia64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux
+        exit 0 ;;
+    m68*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    mips:Linux:*:*)
+        cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
+        ;;
+    ppc:Linux:*:*)
+        # Determine Lib Version
+        cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
@@ -751,127 +797,127 @@ main(argc, argv)
 #if defined(__GLIBC__)
   printf("%s %s\n", __libc_version, __libc_release);
 #else
-  printf("unkown\n");
+  printf("unknown\n");
 #endif
   return 0;
 }
 EOF
-                LIBC=""
-                $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+        LIBC=""
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                ./$dummy | grep 1\.99 > /dev/null
+                if test "$?" = 0 ; then LIBC="libc1" ; fi
+        fi
+        rm -f $dummy.c $dummy
+        echo powerpc-unknown-linux-gnu${LIBC}
+        exit 0 ;;
+    alpha:Linux:*:*)
+        cat <<EOF >$dummy.s
+          .data
+          \$Lformat:
+                .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+           .text
+                .globl main
+                .align 4
+                .ent main
+            main:
+                .frame \$30,16,\$26,0
+                ldgp \$29,0(\$27)
+                .prologue 1
+                .long 0x47e03d80 # implver \$0
+                lda \$2,-1
+                .long 0x47e20c21 # amask \$2,\$1
+                lda \$16,\$Lformat
+                mov \$0,\$17
+                not \$1,\$18
+                jsr \$26,printf
+                ldgp \$29,0(\$26)
+                mov 0,\$16
+                jsr \$26,exit
+                .end main
+EOF
+        LIBC=""
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                case `./$dummy` in
+                0-0)    UNAME_MACHINE="alpha" ;;
+                1-0)    UNAME_MACHINE="alphaev5" ;;
+                1-1)    UNAME_MACHINE="alphaev56" ;;
+                1-101)  UNAME_MACHINE="alphapca56" ;;
+                2-303)  UNAME_MACHINE="alphaev6" ;;
+                2-307)  UNAME_MACHINE="alphaev67" ;;
+                esac
+                objdump --private-headers $dummy | \
+                  grep ld.so.1 > /dev/null
                 if test "$?" = 0 ; then
-                        ./$dummy | grep 1\.99 > /dev/null
-                        if test "$?" = 0 ; then
-                                LIBC="libc1"
-                        fi
+                        LIBC="libc1"
                 fi
-                rm -f $dummy.c $dummy
-                echo powerpc-unknown-linux-gnu${LIBC}
+        fi
+        rm -f $dummy.s $dummy
+        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+        # Look for CPU level
+        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+          PA7*) echo hppa1.1-unknown-linux-gnu ;;
+          PA8*) echo hppa2.0-unknown-linux-gnu ;;
+          *)    echo hppa-unknown-linux-gnu ;;
+        esac
+        exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-gnu
+        exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+        echo ${UNAME_MACHINE}-ibm-linux
+        exit 0 ;;
+    sh*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    x86_64:Linux:*:*)
+        echo x86_64-unknown-linux-gnu
+        exit 0 ;;
+    i*86:Linux:*:*)
+        # The BFD linker knows what the default object file format is, so
+        # first see if it will tell us. cd to the root directory to prevent
+        # problems with other programs or directories called `ld' in the path.
+        ld_supported_emulations=`cd /; ld --help 2>&1 \
+                         | sed -ne '/supported emulations:/!d
+                                    s/[         ][      ]*/ /g
+                                    s/.*supported emulations: *//
+                                    s/ .*//
+                                    p'`
+        case "$ld_supported_emulations" in
+          i*86linux)
+                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
                 exit 0
                 ;;
-          shelf_linux)
-                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+          elf_i*86)
+                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+                ;;
+          i*86coff)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                 exit 0
                 ;;
         esac
-
-        if test "${UNAME_MACHINE}" = "alpha" ; then
-                cat <<EOF >$dummy.s
-                        .data
-                \$Lformat:
-                        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
-
-                        .text
-                        .globl main
-                        .align 4
-                        .ent main
-                main:
-                        .frame \$30,16,\$26,0
-                        ldgp \$29,0(\$27)
-                        .prologue 1
-                        .long 0x47e03d80 # implver \$0
-                        lda \$2,-1
-                        .long 0x47e20c21 # amask \$2,\$1
-                        lda \$16,\$Lformat
-                        mov \$0,\$17
-                        not \$1,\$18
-                        jsr \$26,printf
-                        ldgp \$29,0(\$26)
-                        mov 0,\$16
-                        jsr \$26,exit
-                        .end main
-EOF
-                LIBC=""
-                $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-                if test "$?" = 0 ; then
-                        case `./$dummy` in
-                        0-0)
-                                UNAME_MACHINE="alpha"
-                                ;;
-                        1-0)
-                                UNAME_MACHINE="alphaev5"
-                                ;;
-                        1-1)
-                                UNAME_MACHINE="alphaev56"
-                                ;;
-                        1-101)
-                                UNAME_MACHINE="alphapca56"
-                                ;;
-                        2-303)
-                                UNAME_MACHINE="alphaev6"
-                                ;;
-                        2-307)
-                                UNAME_MACHINE="alphaev67"
-                                ;;
-                        esac
-
-                        objdump --private-headers $dummy | \
-                          grep ld.so.1 > /dev/null
-                        if test "$?" = 0 ; then
-                                LIBC="libc1"
-                        fi
-                fi
-                rm -f $dummy.s $dummy
-                echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-        elif test "${UNAME_MACHINE}" = "mips" ; then
-          cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-        int main (int argc, char *argv[]) {
-#else
-        int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-          $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-          rm -f $dummy.c $dummy
-        elif test "${UNAME_MACHINE}" = "s390"; then
-          echo s390-ibm-linux && exit 0
-        else
-          # Either a pre-BFD a.out linker (linux-gnuoldld)
-          # or one that does not give us useful --help.
-          # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-          # If ld does not provide *any* "supported emulations:"
-          # that means it is gnuoldld.
-          echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-          test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-          case "${UNAME_MACHINE}" in
-          i?86)
-            VENDOR=pc;
-            ;;
-          *)
-            VENDOR=unknown;
-            ;;
-          esac
-          # Determine whether the default compiler is a.out or elf
-          cat >$dummy.c <<EOF
+        # Either a pre-BFD a.out linker (linux-gnuoldld)
+        # or one that does not give us useful --help.
+        # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+        # If ld does not provide *any* "supported emulations:"
+        # that means it is gnuoldld.
+        test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+        case "${UNAME_MACHINE}" in
+        i*86)
+          VENDOR=pc;
+          ;;
+        *)
+          VENDOR=unknown;
+          ;;
+        esac
+        # Determine whether the default compiler is a.out or elf
+        cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -895,15 +941,16 @@ EOF
   return 0;
 }
 EOF
-          $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-          rm -f $dummy.c $dummy
-        fi ;;
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
+        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+        ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+    i*86:DYNIX/ptx:4*:*)
         echo i386-sequent-sysv4
         exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -911,7 +958,7 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
         exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
         if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
                 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -919,7 +966,7 @@ EOF
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
         exit 0 ;;
-    i?86:*:5:7*)
+    i*86:*:5:7*)
         # Fixed at (any) Pentium or better
         UNAME_MACHINE=i586
         if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
@@ -928,7 +975,7 @@ EOF
             echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
         fi
         exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -946,7 +993,7 @@ EOF
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
         exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
         echo ${UNAME_MACHINE}-pc-msdosdjgpp
         exit 0 ;;
     pc:*:*:*)
@@ -974,7 +1021,7 @@ EOF
         exit 0 ;;
     M68*:*:R3V[567]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*: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)
         OS_REL=''
         test -r /etc/.relid \
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -985,21 +1032,24 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
         exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
         exit 0 ;;
@@ -1033,7 +1083,7 @@ EOF
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
         exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
         exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1076,15 +1126,52 @@ EOF
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit 0 ;;
-    NSR-W:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
         exit 0 ;;
+    *:NonStop-UX:*:*)
+        echo mips-compaq-nonstopux
+        exit 0 ;;
     BS2000:POSIX*:*:*)
         echo bs2000-siemens-sysv
         exit 0 ;;
     DS/*:UNIX_System_V:*:*)
         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
         exit 0 ;;
+    *:Plan9:*:*)
+        # "uname -m" is not consistent, so use $cputype instead. 386
+        # is converted to i386 for consistency with other x86
+        # operating systems.
+        if test "$cputype" = "386"; then
+            UNAME_MACHINE=i386
+        else
+            UNAME_MACHINE="$cputype"
+        fi
+        echo ${UNAME_MACHINE}-unknown-plan9
+        exit 0 ;;
+    i*86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit 0 ;;
+    *:TOPS-10:*:*)
+        echo pdp10-unknown-tops10
+        exit 0 ;;
+    *:TENEX:*:*)
+        echo pdp10-unknown-tenex
+        exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+        echo pdp10-dec-tops20
+        exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+        echo pdp10-xkl-tops20
+        exit 0 ;;
+    *:TOPS-20:*:*)
+        echo pdp10-unknown-tops20
+        exit 0 ;;
+    *:ITS:*:*)
+        echo pdp10-unknown-its
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1176,11 +1263,24 @@ main ()
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1191,7 +1291,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
@@ -1227,8 +1327,9 @@ fi
 cat >&2 <<EOF
 $0: unable to guess system type
 
-The $version version of this script cannot recognize your system type.
-Please download the most up to date version of the config scripts:
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
 
     ftp://ftp.gnu.org/pub/gnu/config/
 
@@ -1237,7 +1338,7 @@ send the following data and any information you think might be
 pertinent to <config-patches@gnu.org> in order to provide the needed
 information to handle your system.
 
-config.guess version = $version
+config.guess timestamp = $timestamp
 
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
@@ -1264,7 +1365,7 @@ exit 1
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
+# time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End: