1 files changed, 197 insertions, 241 deletions

diff --git a/config.guess b/config.guess
index ba6616516..83c544d97 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, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2002-01-30'
 
 # 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
@@ -24,8 +24,9 @@ timestamp='2001-04-20'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -52,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -95,25 +96,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 # 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
+set_cc_for_build='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
+          ($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
+             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
+          CC_FOR_BUILD=no_compiler_found ;
         fi
         ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
         PATH=$PATH:/.attbin ; export PATH
 fi
@@ -127,29 +128,29 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-        # Netbsd (nbsd) targets should (where applicable) match one or
+        # NetBSD (nbsd) targets should (where applicable) match one or
         # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
         # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
         # switched to ELF, *-*-netbsd* would select the old
         # object file format.  This provides both forward
         # compatibility and a consistent mechanism for selecting the
         # object file format.
-        # Determine the machine/vendor (is the vendor relevant).
-        case "${UNAME_MACHINE}" in
-            amiga) machine=m68k-unknown ;;
-            arm32) machine=arm-unknown ;;
-            atari*) machine=m68k-atari ;;
-            sun3*) machine=m68k-sun ;;
-            mac68k) machine=m68k-apple ;;
-            macppc) machine=powerpc-apple ;;
-            hp3[0-9][05]) machine=m68k-hp ;;
-            ibmrt|romp-ibm) machine=romp-ibm ;;
-            *) machine=${UNAME_MACHINE}-unknown ;;
+        #
+        # Note: NetBSD doesn't particularly care about the vendor
+        # portion of the name.  We always set it to "unknown".
+        UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
+            UNAME_MACHINE_ARCH=unknown
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
         esac
         # 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)
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+                eval $set_cc_for_build
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                         | grep __ELF__ >/dev/null
                 then
@@ -171,6 +172,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
         echo "${machine}-${os}${release}"
         exit 0 ;;
+    amiga:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    arc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    hp300:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mac68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    macppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    pmax:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sgi:OpenBSD:*:*)
+        echo mipseb-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sun3:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    *:OpenBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     alpha:OSF1:*:*)
         if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -204,6 +244,7 @@ main:
         jsr \$26,exit
         .end main
 EOF
+        eval $set_cc_for_build
         $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
                 case `./$dummy` in
@@ -225,6 +266,9 @@ EOF
                         2-307)
                                 UNAME_MACHINE="alphaev67"
                                 ;;
+                        2-1307)
+                                UNAME_MACHINE="alphaev68"
+                                ;;
                 esac
         fi
         rm -f $dummy.s $dummy
@@ -242,29 +286,11 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
         echo m68k-unknown-sysv4
         exit 0;;
-    amiga:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-amigaos
         exit 0 ;;
-    arc64:OpenBSD:*:*)
-        echo mips64el-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    arc:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    hkmips:OpenBSD:*:*)
-        echo mips-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    pmax:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sgi:OpenBSD:*:*)
-        echo mips-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-morphos
         exit 0 ;;
     *:OS/390:*:*)
         echo i370-ibm-openedition
@@ -328,9 +354,6 @@ EOF
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
         exit 0 ;;
-    atari*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -357,18 +380,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
         exit 0 ;;
@@ -385,6 +396,7 @@ EOF
         echo clipper-intergraph-clix${UNAME_RELEASE}
         exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+        eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -475,6 +487,7 @@ EOF
         exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+                eval $set_cc_for_build
                 sed 's/^                //' << EOF >$dummy.c
                 #include <sys/systemcfg.h>
 
@@ -536,10 +549,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
@@ -548,12 +559,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
-              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>
@@ -586,10 +598,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 ;;
@@ -598,6 +610,7 @@ EOF
         echo ia64-hp-hpux${HPUX_REV}
         exit 0 ;;
     3050*:HI-UX:*:*)
+        eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
         int
@@ -633,7 +646,7 @@ EOF
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
         exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
         echo hppa1.0-hp-mpeix
         exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -652,9 +665,6 @@ EOF
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
         exit 0 ;;
-    hppa*:OpenBSD:*:*)
-        echo hppa-unknown-openbsd
-        exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
         exit 0 ;;
@@ -677,12 +687,13 @@ EOF
         echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE}
+        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
         | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+              -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -705,9 +716,6 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
         exit 0 ;;
@@ -720,9 +728,6 @@ EOF
     *:FreeBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
-    *:OpenBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
         exit 0 ;;
@@ -732,6 +737,9 @@ EOF
     i*:PW*:*)
         echo ${UNAME_MACHINE}-pc-pw32
         exit 0 ;;
+    x86:Interix*:3*)
+        echo i386-pc-interix3
+        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
@@ -763,97 +771,43 @@ EOF
         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;
-}
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #undef CPU
+        #undef mips
+        #undef mipsel
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
+        CPU=mipsel 
+        #else
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
+        CPU=mips
+        #else
+        CPU=
+        #endif
+        #endif 
 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
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        rm -f $dummy.c
+        test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
         ;;
     ppc:Linux:*:*)
-        # Determine Lib Version
-        cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-        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}
+        echo powerpc-unknown-linux-gnu
+        exit 0 ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-gnu
         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
-                        LIBC="libc1"
-                fi
-        fi
-        rm -f $dummy.s $dummy
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+          EV5)   UNAME_MACHINE=alphaev5 ;;
+          EV56)  UNAME_MACHINE=alphaev56 ;;
+          PCA56) UNAME_MACHINE=alphapca56 ;;
+          PCA57) UNAME_MACHINE=alphapca56 ;;
+          EV6)   UNAME_MACHINE=alphaev6 ;;
+          EV67)  UNAME_MACHINE=alphaev67 ;;
+          EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
         exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
@@ -883,71 +837,61 @@ EOF
         # 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
+        # Export LANG=C to prevent ld from outputting information in other
+        # languages.
+        ld_supported_targets=`LANG=C; export LANG; cd /; ld --help 2>&1 \
+                         | sed -ne '/supported targets:/!d
                                     s/[         ][      ]*/ /g
-                                    s/.*supported emulations: *//
+                                    s/.*supported targets: *//
                                     s/ .*//
                                     p'`
-        case "$ld_supported_emulations" in
-          i*86linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0
-                ;;
-          elf_i*86)
+        case "$ld_supported_targets" in
+          elf32-i386)
                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                 ;;
-          i*86coff)
+          a.out-i386-linux)
+                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+                exit 0 ;;               
+          coff-i386)
                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-                exit 0
-                ;;
-        esac
-        # 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;
-          ;;
+                exit 0 ;;
+          "")
+                # Either a pre-BFD a.out linker (linux-gnuoldld) or
+                # one that does not give us useful --help.
+                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+                exit 0 ;;
         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 */
-        int main (int argc, char *argv[]) {
-#else
-        int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #ifdef __ELF__
+        # ifdef __GLIBC__
+        #  if __GLIBC__ >= 2
+        LIBC=gnu
+        #  else
+        LIBC=gnulibc1
+        #  endif
+        # else
+        LIBC=gnulibc1
+        # endif
+        #else
+        #ifdef __INTEL_COMPILER
+        LIBC=gnu
+        #else
+        LIBC=gnuaout
+        #endif
+        #endif
 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
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        rm -f $dummy.c
+        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
         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*:*)
+        # 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.
         echo i386-sequent-sysv4
         exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
@@ -966,14 +910,13 @@ EOF
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
         exit 0 ;;
-    i*86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-        else
-            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-        fi
+    i*86:*:5:[78]*)
+        case `/bin/uname -X | grep "^Machine"` in
+            *486*)           UNAME_MACHINE=i486 ;;
+            *Pentium)        UNAME_MACHINE=i586 ;;
+            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+        esac
+        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
         exit 0 ;;
     i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -1021,7 +964,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 | 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`
@@ -1067,8 +1010,8 @@ EOF
                 echo ns32k-sni-sysv
         fi
         exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1080,6 +1023,10 @@ EOF
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
         exit 0 ;;
+    *:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo hppa1.1-stratus-vos
+        exit 0 ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
         exit 0 ;;
@@ -1120,13 +1067,15 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
         if test "${UNAME_MACHINE}" = "x86pc"; then
                 UNAME_MACHINE=pc
+                echo i386-${UNAME_MACHINE}-nto-qnx
+        else
+                echo `uname -p`-${UNAME_MACHINE}-nto-qnx
         fi
-        echo `uname -p`-${UNAME_MACHINE}-nto-qnx
         exit 0 ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
         exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1172,11 +1121,18 @@ EOF
     *:ITS:*:*)
         echo pdp10-unknown-its
         exit 0 ;;
+    i*86:XTS-300:*:STOP)
+        echo ${UNAME_MACHINE}-unknown-stop
+        exit 0 ;;
+    i*86:atheos:*:*)
+        echo ${UNAME_MACHINE}-unknown-atheos
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>