Changeset 008733 in git

Timestamp:

Jun 30, 2010, 2:25:19 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4cfe968e9f2c139f34f69fccb257823023c3890e

Parents:

879cc3cdc8d8c8a1af32e08d773dd1d1340c74b3

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-06-30 14:25:19+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:21+01:00

Message:

config.guess, config.sub: update

Files:

• config.guess (modified) (25 diffs)
• config.sub (modified) (61 diffs)

config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
-#
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2009-12-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
@@ -17 +19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
@@ -24 +27 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
@@ -31 +36 @@
 # 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).
-#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -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, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - ) # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+        for c in cc gcc c89 c99 ; do
+          if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+             CC_FOR_BUILD="$c"; break ;
+          fi ;
+        done ;
+        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 ; set_cc_for_build= ;'
 
 # 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
@@ -46 +138 @@
 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
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+case "${UNAME_SYSTEM}" in
+Linux|GNU/*)
+        eval $set_cc_for_build
+        cat <<-EOF > $dummy.c
+        #include <features.h>
+        #ifdef __UCLIBC__
+        # ifdef __UCLIBC_CONFIG_VERSION__
+        LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+        # else
+        LIBC=uclibc
+        # endif
+        #else
+        # ifdef __dietlibc__
+        LIBC=dietlibc
+        # else
+        LIBC=gnu
+        # endif
+        #endif
+        EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+        ;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    i?86:*:*:*)
-        echo 'xwqilkn(){}' >dummy.c
-        ${CC-cc} dummy.c -S 2>/dev/null
-        if test "$?" = 0 ; then
-            u=`grep xwqilkn dummy.s | head -1 | sed 's;[^_]*\([_]*\)xwqilkn;\1;'`
-            cat <<EOF >dummy1.s
-        .globl ${u}cpuid
-${u}cpuid:
-        pushl %esi
-        pushl %ebx
-        movl 16(%esp),%eax
-        .word 0xa20f
-        movl 12(%esp),%esi
-        movl %ebx,(%esi)
-        movl %edx,4(%esi)
-        movl %ecx,8(%esi)
-        popl %ebx
-        popl %esi
-        ret
-EOF
-            cat <<EOF >dummy2.c
-main ()
-{
-  char vendor_string[13];
-  char dummy_string[12];
-  long fms;
-  int family, model;
-  char *modelstr;
-
-  cpuid (vendor_string, 0);
-  vendor_string[12] = 0;
-
-  fms = cpuid (dummy_string, 1);
-
-  family = (fms >> 8) & 15;
-  model = (fms >> 4) & 15;
-
-  modelstr = "i486";
-  if (strcmp (vendor_string, "GenuineIntel") == 0)
-    {
-      switch (family)
-        {
-        case 5:
-          if (model <= 2)
-            modelstr = "pentium";
-          else if (model >= 4)
-            modelstr = "pentiummmx";
-          break;
-        case 6:
-          if (model == 1)
-            modelstr = "pentiumpro";
-          else if (model <= 5)
-            modelstr = "pentium2";
-          else
-            modelstr = "pentium3";
-          break;
-        }
-    }
-  else if (strcmp (vendor_string, "AuthenticAMD") == 0)
-    {
-      switch (family)
-        {
-        case 5:
-          if (model <= 3)
-            modelstr = "k5";
-          else if (model <= 7)
-            modelstr = "k6";
-          else if (model <= 8)
-            modelstr = "k62";
-          else if (model <= 9)
-            modelstr = "k63";
-          break;
-        case 6:
-          modelstr = "athlon";
-          break;
-        }
-    }
-  else if (strcmp (vendor_string, "CyrixInstead") == 0)
-    {
-      /* Should recognize Cyrix' processors too.  */
-    }
-
-  printf ("%s\n", modelstr);
-  return 0;
-}
-EOF
-            ${CC-cc} dummy1.s dummy2.c -o dummy 2>/dev/null
-            if test "$?" = 0 ; then
-                X86CPU=`./dummy`
-            fi
-        fi
-
-        # Default to believing uname -m if the program fails to compile or
-        # run.  Will fail to run on 386 since cpuid was only added on 486.
-        if test -z "$X86CPU"
-        then
-            X86CPU="$UNAME_MACHINE"
-        fi
-        rm -f dummy.c dummy.s dummy1.s dummy2.c dummy
-  ;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+        # 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.
+        #
+        # Note: NetBSD doesn't particularly care about the vendor
+        # portion of the name.  We always set it to "unknown".
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+        case "${UNAME_MACHINE_ARCH}" in
+            armeb) machine=armeb-unknown ;;
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            sh5el) machine=sh5le-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_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 -q __ELF__
+                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
+        # Debian GNU/NetBSD machines have a different userland, and
+        # thus, need a distinct triplet. However, they do not need
+        # kernel version information, so it can be replaced with a
+        # suitable tag, in the style of linux-gnu.
+        case "${UNAME_VERSION}" in
+            Debian*)
+                release='-gnu'
+                ;;
+            *)
+                release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+                ;;
+        esac
+        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+        # contains redundant information, the shorter form:
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}${release}"
+        exit ;;
+    *:OpenBSD:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+        exit ;;
+    *:ekkoBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+        exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
+    macppc:MirBSD:*:*)
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
+    *:MirBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
     alpha:OSF1:*:*)
-        if test $UNAME_RELEASE = "V4.0"; then
+        case $UNAME_RELEASE in
+        *4.0)
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-        fi
+                ;;
+        *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
+        # According to Compaq, /usr/sbin/psrinfo has been available on
+        # OSF/1 and Tru64 systems produced since 1995.  I hope that
+        # covers most systems running today.  This code pipes the CPU
+        # types through head -n 1, so we only detect the type of CPU 0.
+        ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+        case "$ALPHA_CPU_TYPE" in
+            "EV4 (21064)")
+                UNAME_MACHINE="alpha" ;;
+            "EV4.5 (21064)")
+                UNAME_MACHINE="alpha" ;;
+            "LCA4 (21066/21068)")
+                UNAME_MACHINE="alpha" ;;
+            "EV5 (21164)")
+                UNAME_MACHINE="alphaev5" ;;
+            "EV5.6 (21164A)")
+                UNAME_MACHINE="alphaev56" ;;
+            "EV5.6 (21164PC)")
+                UNAME_MACHINE="alphapca56" ;;
+            "EV5.7 (21164PC)")
+                UNAME_MACHINE="alphapca57" ;;
+            "EV6 (21264)")
+                UNAME_MACHINE="alphaev6" ;;
+            "EV6.7 (21264A)")
+                UNAME_MACHINE="alphaev67" ;;
+            "EV6.8CB (21264C)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8AL (21264B)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8CX (21264D)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.9A (21264/EV69A)")
+                UNAME_MACHINE="alphaev69" ;;
+            "EV7 (21364)")
+                UNAME_MACHINE="alphaev7" ;;
+            "EV7.9 (21364A)")
+                UNAME_MACHINE="alphaev79" ;;
+        esac
+        # A Pn.n version is a patched version.
         # A Vn.n version is a released version.
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        cat <<EOF >dummy.s
-        .globl main
-        .ent main
-main:
-        .frame \$30,0,\$26,0
-        .prologue 0
-        .long 0x47e03d80 # implver $0
-        lda \$2,259
-        .long 0x47e20c21 # amask $2,$1
-        srl \$1,8,\$2
-        sll \$2,2,\$2
-        sll \$0,3,\$0
-        addl \$1,\$0,\$0
-        addl \$2,\$0,\$0
-        ret \$31,(\$26),1
-        .end main
-EOF
-        ${CC-cc} dummy.s -o dummy 2>/dev/null
-        if test "$?" = 0 ; then
-                ./dummy
-                case "$?" in
-                        7)
-                                UNAME_MACHINE="alpha"
-                                ;;
-                        15)
-                                UNAME_MACHINE="alphaev5"
-                                ;;
-                        14)
-                                UNAME_MACHINE="alphaev56"
-                                ;;
-                        10)
-                                UNAME_MACHINE="alphapca56"
-                                ;;
-                        16)
-                                UNAME_MACHINE="alphaev6"
-                                ;;
-                esac
-        fi
-        rm -f dummy.s dummy
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
-        exit 0 ;;
-    alpha:NetBSD:*:* | alpha:FreeBSD:*:*)
-        cat <<EOF >dummy.s
-        .globl main
-        .ent main
-main:
-        .frame \$30,0,\$26,0
-        .prologue 0
-        .long 0x47e03d80 # implver $0
-        lda \$2,259
-        .long 0x47e20c21 # amask $2,$1
-        srl \$1,8,\$2
-        sll \$2,2,\$2
-        sll \$0,3,\$0
-        addl \$1,\$0,\$0
-        addl \$2,\$0,\$0
-        ret \$31,(\$26),1
-        .end main
-EOF
-        ${CC-cc} dummy.s -o dummy 2>/dev/null
-        if test "$?" = 0 ; then
-                ./dummy
-                case "$?" in
-                        7)
-                                UNAME_MACHINE="alpha"
-                                ;;
-                        15)
-                                UNAME_MACHINE="alphaev5"
-                                ;;
-                        14)
-                                UNAME_MACHINE="alphaev56"
-                                ;;
-                        10)
-                                UNAME_MACHINE="alphapca56"
-                                ;;
-                        16)
-                                UNAME_MACHINE="alphaev6"
-                                ;;
-                esac
-        fi
-        rm -f dummy.s dummy
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM}${UNAME_RELEASE} | sed -e 's/^[VTX]//' -e 's/[-(].*//' | tr [[A-Z]] [[a-z]]`
-        exit 0 ;;
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        exit ;;
+    Alpha\ *:Windows_NT*:*)
+        # How do we know it's Interix rather than the generic POSIX subsystem?
+        # Should we change UNAME_MACHINE based on the output of uname instead
+        # of the specific Alpha model?
+        echo alpha-pc-interix
+        exit ;;
     21064:Windows_NT:50:3)
         echo alpha-dec-winnt3.5
-        exit 0 ;;
+        exit ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-cbm-sysv4
-        exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        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}
-        exit 0 ;;
+        echo m68k-unknown-sysv4
+        exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-amigaos
+        exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-morphos
+        exit ;;
+    *:OS/390:*:*)
+        echo i370-ibm-openedition
+        exit ;;
+    *:z/VM:*:*)
+        echo s390-ibm-zvmoe
+        exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+        exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
-        exit 0;;
-    arm32:NetBSD:*:*)
-        echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
-    SR2?01:HI-UX/MPP:*:*)
+        exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+        echo arm-unknown-riscos
+        exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
-        exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+        exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
         if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -293 +338 @@
                 echo pyramid-pyramid-bsd
         fi
-        exit 0 ;;
-    NILE:*:*:dcosx)
+        exit ;;
+    NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
-        exit 0 ;;
-    sun4[md]:SunOS:5.*:*)
-        echo sparcv8-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
-    sun4u:SunOS:5.*:*)
-        echo sparcv9-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
+        exit ;;
+    DRS?6000:unix:4.0:6*)
+        echo sparc-icl-nx6
+        exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+        case `/usr/bin/uname -p` in
+            sparc) echo sparc-icl-nx7; exit ;;
+        esac ;;
+    s390x:SunOS:*:*)
+        echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4H:SunOS:5.*:*)
+        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
-    i86pc:SunOS:5.*:*)
-        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
-    sun4[md]:SunOS:*:*)
-        case "`/usr/bin/arch -k`" in
-            Series*|S4*)
-                UNAME_RELEASE=`uname -v`
-                ;;
-        esac
-        # Japanese Language versions have a version number like `4.1.3-JL'.
-        echo sparcv8-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-        exit 0 ;;
+        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+        echo i386-pc-auroraux${UNAME_RELEASE}
+        exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        eval $set_cc_for_build
+        SUN_ARCH="i386"
+        # If there is a compiler, see if it is configured for 64-bit objects.
+        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+        # This test works for both compilers.
+        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                grep IS_64BIT_ARCH >/dev/null
+            then
+                SUN_ARCH="x86_64"
+            fi
+        fi
+        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
+    sun4*:SunOS:6*:*)
+        # According to config.sub, this is the proper way to canonicalize
+        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+        # it's likely to be more like Solaris than SunOS4.
+        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
     sun4*:SunOS:*:*)
         case "`/usr/bin/arch -k`" in
@@ -326 +391 @@
         # Japanese Language versions have a version number like `4.1.3-JL'.
         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-        exit 0 ;;
+        exit ;;
     sun3*:SunOS:*:*)
         echo m68k-sun-sunos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     sun*:*:4.2BSD:*)
-        UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
         case "`/bin/arch`" in
@@ -341 +406 @@
                 ;;
         esac
-        exit 0 ;;
+        exit ;;
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
-        exit 0 ;;
-    atari*:NetBSD:*:*)
-        echo m68k-atari-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    atari*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:NetBSD:*:*)
-        echo m68k-sun-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:NetBSD:*:*)
-        echo m68k-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    # 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
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+        echo m68k-apple-machten${UNAME_RELEASE}
+        exit ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
-        exit 0 ;;
+        exit ;;
     RISC*:ULTRIX:*:*)
         echo mips-dec-ultrix${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
-        exit 0 ;;
-    2020:CLIX:*:*)
+        exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
         echo clipper-intergraph-clix${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        sed 's/^        //' << EOF >dummy.c
-        int main (argc, argv) int argc; char **argv; {
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
         #if defined (host_mips) && defined (MIPSEB)
         #if defined (SYSTYPE_SYSV)
@@ -404 +477 @@
         }
 EOF
-        ${CC-cc} 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
+        $CC_FOR_BUILD -o $dummy $dummy.c &&
+          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+          SYSTEM_NAME=`$dummy $dummyarg` &&
+            { echo "$SYSTEM_NAME"; exit; }
         echo mips-mips-riscos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    Motorola:PowerMAX_OS:*:*)
+        echo powerpc-motorola-powermax
+        exit ;;
+    Motorola:*:4.3:PL8-*)
+        echo powerpc-harris-powermax
+        exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+        echo powerpc-harris-powermax
+        exit ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
-        exit 0 ;;
+        exit ;;
     m88k:CX/UX:7*:*)
         echo m88k-harris-cxux7
-        exit 0 ;;
+        exit ;;
     m88k:*:4*:R4*)
         echo m88k-motorola-sysv4
-        exit 0 ;;
+        exit ;;
     m88k:*:3*:R3*)
         echo m88k-motorola-sysv3
-        exit 0 ;;
+        exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-             -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+        then
+            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+               [ ${TARGET_BINARY_INTERFACE}x = x ]
+            then
                 echo m88k-dg-dgux${UNAME_RELEASE}
+            else
+                echo m88k-dg-dguxbcs${UNAME_RELEASE}
+            fi
         else
-                echo m88k-dg-dguxbcs${UNAME_RELEASE}
-        fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
-        exit 0 ;;
+            echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+        exit ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
-        exit 0 ;;
+        exit ;;
     M88*:*:R3*:*)
         # Delta 88k system running SVR3
         echo m88k-motorola-sysv3
-        exit 0 ;;
+        exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
         echo m88k-tektronix-sysv3
-        exit 0 ;;
+        exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
         echo m68k-tektronix-bsd
-        exit 0 ;;
+        exit ;;
     *:IRIX*:*:*)
         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-        exit 0 ;;
+        exit ;;
     ????????: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:*:*)
+        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
         echo i386-ibm-aix
-        exit 0 ;;
+        exit ;;
+    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 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                sed 's/^                //' << EOF >dummy.c
+                eval $set_cc_for_build
+                sed 's/^                //' << EOF >$dummy.c
                 #include <sys/systemcfg.h>
 
@@ -470 +564 @@
                         }
 EOF
-                ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-                rm -f dummy.c dummy
-                echo rs6000-ibm-aix3.2.5
+                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+                then
+                        echo "$SYSTEM_NAME"
+                else
+                        echo rs6000-ibm-aix3.2.5
+                fi
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -478 +575 @@
                 echo rs6000-ibm-aix3.2
         fi
-        exit 0 ;;
-    *:AIX:*:4)
-        sed 's/^        //' << EOF >dummy.c
-        #include <stdio.h>
-        #include <sys/systemcfg.h>
-        main ()
-        {
-          if (_system_configuration.architecture == POWER_RS
-              || _system_configuration.implementation == POWER_601)
-            puts ("power");
-          else
-            {
-              if (_system_configuration.width == 64)
-                puts ("powerpc64");
-              else
-                puts ("powerpc");
-            }
-          exit (0);
-        }
-EOF
-        ${CC-cc} dummy.c -o dummy
-        IBM_ARCH=`./dummy`
-        rm -f dummy.c dummy
+        exit ;;
+    *:AIX:*:[456])
+        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+                IBM_ARCH=rs6000
+        else
+                IBM_ARCH=powerpc
+        fi
         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 ;;
+        exit ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
-        exit 0 ;;
+        exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
-        exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+        exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-        exit 0 ;;                           # report: romp-ibm BSD 4.3
+        exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
         echo rs6000-bull-bosx
-        exit 0 ;;
+        exit ;;
     DPX/2?00:B.O.S.:*:*)
         echo m68k-bull-sysv3
-        exit 0 ;;
+        exit ;;
     9000/[34]??:4.3bsd:1.*:*)
         echo m68k-hp-bsd
-        exit 0 ;;
+        exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
         echo m68k-hp-bsd4.4
-        exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+        exit ;;
+    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/6?? )            HP_ARCH=hppa1.0 ;;
-            9000/78? )            HP_ARCH=hppa2.0 ;;
-            9000/7?? )            HP_ARCH=hppa1.1 ;;
-            9000/8[67]1 | 9000/80[24] | 9000/8[10]0 | 9000/8[78]9 | 9000/893 )
-                                  HP_ARCH=hppa2.0 ;;
-            9000/8?[13679] )      HP_ARCH=hppa1.1 ;;
-            9000/8?? )            HP_ARCH=hppa1.0 ;;
+            9000/[678][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" ;;
+                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+                fi
+                if [ "${HP_ARCH}" = "" ]; then
+                    eval $set_cc_for_build
+                    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+                {
+                case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+                    switch (bits)
+                        {
+                        case 64: puts ("hppa2.0w"); break;
+                        case 32: puts ("hppa2.0n"); break;
+                        default: puts ("hppa2.0"); break;
+                        } break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+                    puts ("hppa2.0"); break;
+              #endif
+                default: puts ("hppa1.0"); break;
+                }
+                  exit (0);
+              }
+EOF
+                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                    test -z "$HP_ARCH" && HP_ARCH=hppa
+                fi ;;
         esac
+        if [ ${HP_ARCH} = "hppa2.0w" ]
+        then
+            eval $set_cc_for_build
+
+            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+            # generating 64-bit code.  GNU and HP use different nomenclature:
+            #
+            # $ CC_FOR_BUILD=cc ./config.guess
+            # => hppa2.0w-hp-hpux11.23
+            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+            # => hppa64-hp-hpux11.23
+
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+                grep -q __LP64__
+            then
+                HP_ARCH="hppa2.0w"
+            else
+                HP_ARCH="hppa64"
+            fi
+        fi
+        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+        exit ;;
+    ia64:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-        exit 0 ;;
+        echo ia64-hp-hpux${HPUX_REV}
+        exit ;;
     3050*:HI-UX:*:*)
-        sed 's/^        //' << EOF >dummy.c
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
         int
@@ -570 +724 @@
         }
 EOF
-        ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-        rm -f dummy.c dummy
+        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+                { echo "$SYSTEM_NAME"; exit; }
         echo unknown-hitachi-hiuxwe2
-        exit 0 ;;
+        exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
         echo hppa1.1-hp-bsd
-        exit 0 ;;
+        exit ;;
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
-        exit 0 ;;
+        exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+        echo hppa1.0-hp-mpeix
+        exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
-        exit 0 ;;
+        exit ;;
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
-        exit 0 ;;
-    i?86:OSF1:*:*)
+        exit ;;
+    i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
             echo ${UNAME_MACHINE}-unknown-osf1mk
@@ -592 +749 @@
             echo ${UNAME_MACHINE}-unknown-osf1
         fi
-        exit 0 ;;
+        exit ;;
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
-        exit 0 ;;
+        exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
@@ -604 +761 @@
         else echo c2-convex-bsd
         fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
         echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
         echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-        echo xmp-cray-unicos
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE}
-        exit 0 ;;
+        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
         | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-        exit 0 ;;
+              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+              -e 's/\.[^.]*$/.X/'
+        exit ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos${UNAME_RELEASE}
-        exit 0 ;;
-    CRAY-2:*:*:*)
-        echo cray2-cray-unicos
-        exit 0 ;;
-    CRAY*T3D:*:*)
-        echo alpha-cray-unicos
-        exit 0 ;;
-    CRAY*T3E:*:*)
-        echo alphaev5-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*T3E:*:*:*)
+        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    CRAY*SV1:*:*:*)
+        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    *:UNICOS/mp:*:*)
+        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit ;;
+    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}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-        echo m68k-hp-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-        exit 0 ;;
-    i386:FreeBSD:*:*)
-        echo ${X86CPU}-pc-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit 0 ;;
+        exit ;;
+    sparc*:BSD/OS:*:*)
+        echo sparc-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
+    *:BSD/OS:*:*)
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit 0 ;;
-    i386:NetBSD:*:*)
-        echo ${X86CPU}-pc-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
-    *:NetBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
-    i386:OpenBSD:*:*)
-        echo ${X86CPU}-pc-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
-    *:OpenBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
+        case ${UNAME_MACHINE} in
+            pc98)
+                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
+        exit ;;
     i*:CYGWIN*:*)
-        echo ${UNAME_MACHINE}-pc-cygwin32
-        exit 0 ;;
-    i*:MINGW*:*)
+        echo ${UNAME_MACHINE}-pc-cygwin
+        exit ;;
+    *:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
-        exit 0 ;;
+        exit ;;
+    i*:windows32*:*)
+        # uname -m includes "-pc" on this system.
+        echo ${UNAME_MACHINE}-mingw32
+        exit ;;
+    i*:PW*:*)
+        echo ${UNAME_MACHINE}-pc-pw32
+        exit ;;
+    *:Interix*:*)
+        case ${UNAME_MACHINE} in
+            x86)
+                echo i586-pc-interix${UNAME_RELEASE}
+                exit ;;
+            authenticamd | genuineintel | EM64T)
+                echo x86_64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+            IA64)
+                echo ia64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+        esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+        echo i${UNAME_MACHINE}-pc-mks
+        exit ;;
+    8664:Windows_NT:*)
+        echo x86_64-pc-mks
+        exit ;;
+    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
+        # UNAME_MACHINE based on the output of uname instead of i386?
+        echo i586-pc-interix
+        exit ;;
+    i*:UWIN*:*)
+        echo ${UNAME_MACHINE}-pc-uwin
+        exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+        echo x86_64-unknown-cygwin
+        exit ;;
     p*:CYGWIN*:*)
-        echo powerpcle-unknown-cygwin32
-        exit 0 ;;
+        echo powerpcle-unknown-cygwin
+        exit ;;
     prep*:SunOS:5.*:*)
         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
+        exit ;;
     *:GNU:*:*)
-        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit 0 ;;
-    *:Linux:*:*)
-        # uname on the ARM produces all sorts of strangeness, and we need to
-        # filter it out.
-        case "$UNAME_MACHINE" in
-          arm* | sa110*)              UNAME_MACHINE="arm" ;;
+        # the GNU system
+        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        exit ;;
+    *:GNU/*:*:*)
+        # other systems with GNU libc and userland
+        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+        exit ;;
+    i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit ;;
+    alpha:Linux:*:*)
+        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 -q ld.so.1
+        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    arm*:Linux:*:*)
+        eval $set_cc_for_build
+        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+            | grep -q __ARM_EABI__
+        then
+            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        else
+            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+        fi
+        exit ;;
+    avr32*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    cris:Linux:*:*)
+        echo cris-axis-linux-${LIBC}
+        exit ;;
+    crisv32:Linux:*:*)
+        echo crisv32-axis-linux-${LIBC}
+        exit ;;
+    frv:Linux:*:*)
+        echo frv-unknown-linux-${LIBC}
+        exit ;;
+    i*86:Linux:*:*)
+        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+        exit ;;
+    ia64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    m32r*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    m68*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #undef CPU
+        #undef ${UNAME_MACHINE}
+        #undef ${UNAME_MACHINE}el
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+        CPU=${UNAME_MACHINE}el
+        #else
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+        CPU=${UNAME_MACHINE}
+        #else
+        CPU=
+        #endif
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+        ;;
+    or32:Linux:*:*)
+        echo or32-unknown-linux-${LIBC}
+        exit ;;
+    padre:Linux:*:*)
+        echo sparc-unknown-linux-${LIBC}
+        exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-${LIBC}
+        exit ;;
+    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-${LIBC} ;;
+          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+          *)    echo hppa-unknown-linux-${LIBC} ;;
         esac
-
-        # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us.
-        ld_help_string=`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
-          i?86linux)  echo "${X86CPU}-pc-linux-gnuaout"      ; exit 0 ;;
-          i?86coff)   echo "${X86CPU}-pc-linux-gnucoff"      ; exit 0 ;;
-          sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          elf32ppc)
-                # 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("unkown\n");
-#endif
-  return 0;
-}
-EOF
-                LIBC=""
-                ${CC-cc} 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 ;;
-        esac
-
-        if test "${UNAME_MACHINE}" = "alpha" ; then
-                sed 's/^        //'  <<EOF >dummy.s
-                .globl main
-                .ent main
-        main:
-                .frame \$30,0,\$26,0
-                .prologue 0
-                .long 0x47e03d80 # implver $0
-                lda \$2,259
-                .long 0x47e20c21 # amask $2,$1
-                srl \$1,8,\$2
-                sll \$2,2,\$2
-                sll \$0,3,\$0
-                addl \$1,\$0,\$0
-                addl \$2,\$0,\$0
-                ret \$31,(\$26),1
-                .end main
-EOF
-                LIBC=""
-                ${CC-cc} dummy.s -o dummy 2>/dev/null
-                if test "$?" = 0 ; then
-                        ./dummy
-                        case "$?" in
-                        7)
-                                UNAME_MACHINE="alpha"
-                                ;;
-                        15)
-                                UNAME_MACHINE="alphaev5"
-                                ;;
-                        14)
-                                UNAME_MACHINE="alphaev56"
-                                ;;
-                        10)
-                                UNAME_MACHINE="alphapca56"
-                                ;;
-                        16)
-                                UNAME_MACHINE="alphaev6"
-                                ;;
-                        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
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#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-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-          rm -f dummy.c dummy
-        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;
-            UNAME_MACHINE=${X86CPU}
-            ;;
-          *)
-            VENDOR=unknown;
-            ;;
-          esac
-          # Determine whether the default compiler is a.out or elf
-          cat >dummy.c <<EOF
-#include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#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;
-}
-EOF
-          ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-          rm -f dummy.c dummy
-        fi ;;
-# 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*:*)
+        exit ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-${LIBC}
+        exit ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-${LIBC}
+        exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+        echo ${UNAME_MACHINE}-ibm-linux
+        exit ;;
+    sh64*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    sh*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+        exit ;;
+    x86_64:Linux:*:*)
+        echo x86_64-unknown-linux-${LIBC}
+        exit ;;
+    xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
+    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.*)
+        exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -862 +1006 @@
         # 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.*:*)
+        exit ;;
+    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 ;;
+    i*86:XTS-300:*:STOP)
+        echo ${UNAME_MACHINE}-unknown-stop
+        exit ;;
+    i*86:atheos:*:*)
+        echo ${UNAME_MACHINE}-unknown-atheos
+        exit ;;
+    i*86:syllable:*:*)
+        echo ${UNAME_MACHINE}-pc-syllable
+        exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+        echo i386-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    i*86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
+        exit ;;
+    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_RELEASE}
+                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
         else
-                echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-        fi
-        exit 0 ;;
-    i?86:*:5:7)
-       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
-       (/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
-               && UNAME_MACHINE=i686
-       (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-               && UNAME_MACHINE=i686
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
-       exit 0 ;;
-    i?86:*:3.2:*)
+                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+        fi
+        exit ;;
+    i*86:*:5:[678]*)
+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        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 ;;
+    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
         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_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                         && UNAME_MACHINE=i586
-                (/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
+                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                         && UNAME_MACHINE=i686
-                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-                        && UNAME_MACHINE=i686
+                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+                        && UNAME_MACHINE=i686
                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
         else
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
-        exit 0 ;;
+        exit ;;
     pc:*:*:*)
+        # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-        echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        # the processor, so we play safe by assuming i586.
+        # Note: whatever this is, it MUST be the same as what config.sub
+        # prints for the "djgpp" host, or else GDB configury will decide that
+        # this is a cross-build.
+        echo i586-pc-msdosdjgpp
+        exit ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
-        exit 0 ;;
+        exit ;;
     paragon:*:*:*)
         echo i860-intel-osf1
-        exit 0 ;;
+        exit ;;
     i860:*:4.*:*) # i860-SVR4
         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
@@ -916 +1083 @@
           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
         fi
-        exit 0 ;;
+        exit ;;
     mini*:CTIX:SYS*5:*)
         # "miniframe"
         echo m68010-convergent-sysv
-        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)
+        exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+        echo m68k-convergent-sysv
+        exit ;;
+    M680?0:D-NIX:5.3:*)
+        echo m68k-diab-dnix
+        exit ;;
+    M68*:*:R3V[5678]*:*)
+        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-          && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     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.*:*)
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        test -r /etc/.relid \
+            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+            && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
-        exit 0 ;;
-    i?86:LynxOS:2.*:*)
-        echo i386-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+        exit ;;
+    rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    RM*:ReliantUNIX-*:*:*)
+        echo mips-sni-sysv4
+        exit ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
-        exit 0 ;;
+        exit ;;
     *:SINIX-*:*:*)
         if uname -p 2>/dev/null >/dev/null ; then
@@ -962 +1148 @@
                 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>
+        exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
         # How about differentiating between stratus architectures? -djm
         echo hppa1.1-stratus-sysv4
-        exit 0 ;;
+        exit ;;
     *:*:*:FTX*)
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
-        exit 0 ;;
+        exit ;;
+    i*86:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo ${UNAME_MACHINE}-stratus-vos
+        exit ;;
+    *:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo hppa1.1-stratus-vos
+        exit ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
-        exit 0 ;;
-    news*:NEWS-OS:*:6*)
+        exit ;;
+    news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
-        exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+        exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
                 echo mips-nec-sysv${UNAME_RELEASE}
@@ -988 +1182 @@
                 echo mips-unknown-sysv${UNAME_RELEASE}
         fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
         echo powerpc-be-beos
-        exit 0 ;;
+        exit ;;
     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
         echo powerpc-apple-beos
-        exit 0 ;;
+        exit ;;
+    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
+        echo i586-pc-beos
+        exit ;;
+    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
+        echo i586-pc-haiku
+        exit ;;
+    SX-4:SUPER-UX:*:*)
+        echo sx4-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-5:SUPER-UX:*:*)
+        echo sx5-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-6:SUPER-UX:*:*)
+        echo sx6-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-7:SUPER-UX:*:*)
+        echo sx7-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8:SUPER-UX:*:*)
+        echo sx8-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8R:SUPER-UX:*:*)
+        echo sx8r-nec-superux${UNAME_RELEASE}
+        exit ;;
+    Power*:Rhapsody:*:*)
+        echo powerpc-apple-rhapsody${UNAME_RELEASE}
+        exit ;;
+    *:Rhapsody:*:*)
+        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+        exit ;;
+    *:Darwin:*:*)
+        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+        case $UNAME_PROCESSOR in
+            i386)
+                eval $set_cc_for_build
+                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                      grep IS_64BIT_ARCH >/dev/null
+                  then
+                      UNAME_PROCESSOR="x86_64"
+                  fi
+                fi ;;
+            unknown) UNAME_PROCESSOR=powerpc ;;
+        esac
+        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+        exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+                UNAME_PROCESSOR=i386
+                UNAME_MACHINE=pc
+        fi
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        exit ;;
+    *:QNX:*:4*)
+        echo i386-pc-qnx
+        exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+        echo nse-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+        echo nsr-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    *:NonStop-UX:*:*)
+        echo mips-compaq-nonstopux
+        exit ;;
+    BS2000:POSIX*:*:*)
+        echo bs2000-siemens-sysv
+        exit ;;
+    DS/*:UNIX_System_V:*:*)
+        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+        exit ;;
+    *: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 ;;
+    *:TOPS-10:*:*)
+        echo pdp10-unknown-tops10
+        exit ;;
+    *:TENEX:*:*)
+        echo pdp10-unknown-tenex
+        exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+        echo pdp10-dec-tops20
+        exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+        echo pdp10-xkl-tops20
+        exit ;;
+    *:TOPS-20:*:*)
+        echo pdp10-unknown-tops20
+        exit ;;
+    *:ITS:*:*)
+        echo pdp10-unknown-its
+        exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+        exit ;;
+    *:DragonFly:*:*)
+        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        exit ;;
+    *:*VMS:*:*)
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        case "${UNAME_MACHINE}" in
+            A*) echo alpha-dec-vms ; exit ;;
+            I*) echo ia64-dec-vms ; exit ;;
+            V*) echo vax-dec-vms ; exit ;;
+        esac ;;
+    *:XENIX:*:SysV)
+        echo i386-pc-xenix
+        exit ;;
+    i*86:skyos:*:*)
+        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
+        exit ;;
+    i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
 esac
 
@@ -1000 +1321 @@
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1025 +1347 @@
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
@@ -1038 +1360 @@
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
@@ -1083 +1408 @@
 
 #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
 
@@ -1098 +1436 @@
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+        { echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
@@ -1112 +1450 @@
     c1*)
         echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     c2*)
         if getsysinfo -f scalar_acc
@@ -1118 +1456 @@
         else echo c2-convex-bsd
         fi
-        exit 0 ;;
+        exit ;;
     c34*)
         echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     c38*)
         echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     c4*)
         echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     esac
 fi
 
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+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
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+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 timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
 
 exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

config.sub

@@ -1 +1 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#
-#   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
-#
+
+timestamp='2010-01-22'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21 +23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -29 +31 @@
 # the same distribution terms that you use for the rest of that program.
 
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 # This file is supposed to be the same for all GNU packages
@@ -49 +58 @@
 # It is wrong to echo any other type of specification.
 
-if [ x$1 = x ]
-then
-        echo Configuration name missing. 1>&2
-        echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-        echo "or     $0 ALIAS" 1>&2
-        echo where ALIAS is a recognized configuration type. 1>&2
-        exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-        *local*)
-                echo $1
-                exit 0
-                ;;
-        *)
-        ;;
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -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.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - ) # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
@@ -72 +125 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -98 +154 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple)
+        -apple | -axis | -knuth | -cray | -microblaze)
                 os=
                 basic_machine=$1
                 ;;
+        -bluegene*)
+                os=-cnk
+                ;;
+        -sim | -cisco | -oki | -wec | -winbond)
+                os=
+                basic_machine=$1
+                ;;
+        -scout)
+                ;;
+        -wrs)
+                os=-vxworks
+                basic_machine=$1
+                ;;
+        -chorusos*)
+                os=-chorusos
+                basic_machine=$1
+                ;;
+        -chorusrdb)
+                os=-chorusrdb
+                basic_machine=$1
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco5)
-                os=sco3.2v5
+                os=-sco3.2v5
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
@@ -121 +202 @@
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
+        -sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco*)
                 os=-sco3.2v2
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
+        -udk*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -isc)
                 os=-isc2.2
@@ -146 +234 @@
         -psos*)
                 os=-psos
+                ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
                 ;;
 esac
@@ -153 +245 @@
         # Recognize the basic CPU types without company name.
         # Some are omitted here because they have special meanings below.
-        tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-                | arme[lb] | pyramid | mn10200 | mn10300 \
-                | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-                | hppa2.0 \
-                | alpha | alphaev5 | alphaev56 | ev6 | we32k | ns16k | clipper \
-                | i370 | sh | powerpc | powerpcle | powerpc64 | 1750a | dsp16xx | pdp11 \
-                | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-                | mipstx39 | mipstx39el \
-                | sparc | sparclet | sparclite | sparc64 | v850)
+        1750a | 580 \
+        | a29k \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | bfin \
+        | c4x | clipper \
+        | d10v | d30v | dlx | dsp16xx | dvp \
+        | fido | fr30 | frv \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k | iq2000 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64octeon | mips64octeonel \
+        | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa32r2 | mipsisa32r2el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
+        | mipstx39 | mipstx39el \
+        | mn10200 | mn10300 \
+        | moxie \
+        | mt \
+        | msp430 \
+        | nios | nios2 \
+        | ns16k | ns32k \
+        | or32 \
+        | pdp10 | pdp11 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | pyramid \
+        | rx \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh64 | sh64le \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu | strongarm \
+        | tahoe | thumb | tic4x | tic80 | tron \
+        | ubicom32 \
+        | v850 | v850e \
+        | we32k \
+        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
-        sparcv[89] | supersparc | microsparc | ultrasparc)
+        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+                # Motorola 68HC11/12.
                 basic_machine=$basic_machine-unknown
-                ;;
+                os=-none
+                ;;
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+                ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
+
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
-        i[34]86 | pentium[23] | k5 | k6 | k6[23] | athlon)
+        i*86 | x86_64)
           basic_machine=$basic_machine-pc
           ;;
@@ -179 +327 @@
                 ;;
         # Recognize the basic CPU types with company name.
-        vax-* | tahoe-* | i[34]86-* | pentium[23]-* | i860-* | m32r-* | m68k-* | m68000-* \
-              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-              | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-              | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-              | alpha-* | alphaev5-* | alphaev56-* | alphaev6-* | we32k-* | cydra-* \
-              | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
-              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* | powerpc64-* \
-              | sparc64-* | mips64-* | mipsel-* \
-              | mips64el-* | mips64orion-* | mips64orionel-*  \
-              | mipstx39-* | mipstx39el-* \
-              | f301-* | k6-* | k6[23]-* | athlon-*)
-                ;;
-        sparcv[89]-* | supersparc-* | microsparc-* | ultrasparc-*)
+        580-* \
+        | a29k-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* | avr32-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+        | clipper-* | craynv-* | cydra-* \
+        | d10v-* | d30v-* | dlx-* \
+        | elxsi-* \
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* | iq2000-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64octeon-* | mips64octeonel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa32r2-* | mipsisa32r2el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipstx39-* | mipstx39el-* \
+        | mmix-* \
+        | mt-* \
+        | msp430-* \
+        | nios-* | nios2-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | pyramid-* \
+        | romp-* | rs6000-* | rx-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+        | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+        | tahoe-* | thumb-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile-* | tilegx-* \
+        | tron-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | vax-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | xstormy16-* | xtensa*-* \
+        | ymp-* \
+        | z8k-* | z80-*)
+                ;;
+        # Recognize the basic CPU types without company name, with glob match.
+        xtensa*)
+                basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
+        386bsd)
+                basic_machine=i386-unknown
+                os=-bsd
+                ;;
         3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
                 basic_machine=m68000-att
@@ -201 +408 @@
         3b*)
                 basic_machine=we32k-att
+                ;;
+        a29khif)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        abacus)
+                basic_machine=abacus-unknown
+                ;;
+        adobe68k)
+                basic_machine=m68010-adobe
+                os=-scout
                 ;;
         alliant | fx80)
@@ -212 +430 @@
                 os=-bsd
                 ;;
+        amd64)
+                basic_machine=x86_64-pc
+                ;;
+        amd64-*)
+                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -217 +441 @@
                 ;;
         amiga | amiga-*)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 ;;
         amigaos | amigados)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 os=-amigaos
                 ;;
         amigaunix | amix)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 os=-sysv4
                 ;;
@@ -231 +455 @@
                 os=-sysv
                 ;;
+        apollo68bsd)
+                basic_machine=m68k-apollo
+                os=-bsd
+                ;;
+        aros)
+                basic_machine=i386-pc
+                os=-aros
+                ;;
         aux)
                 basic_machine=m68k-apple
@@ -239 +471 @@
                 os=-dynix
                 ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        bluegene*)
+                basic_machine=powerpc-ibm
+                os=-cnk
+                ;;
+        c90)
+                basic_machine=c90-cray
+                os=-unicos
+                ;;
+        cegcc)
+                basic_machine=arm-unknown
+                os=-cegcc
+                ;;
         convex-c1)
                 basic_machine=c1-convex
@@ -259 +511 @@
                 os=-bsd
                 ;;
-        cray | ymp)
-                basic_machine=ymp-cray
+        cray | j90)
+                basic_machine=j90-cray
                 os=-unicos
                 ;;
-        cray2)
-                basic_machine=cray2-cray
-                os=-unicos
-                ;;
-        [ctj]90-cray)
-                basic_machine=c90-cray
-                os=-unicos
+        craynv)
+                basic_machine=craynv-cray
+                os=-unicosmp
+                ;;
+        cr16)
+                basic_machine=cr16-unknown
+                os=-elf
                 ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
+        crisv32 | crisv32-* | etraxfs*)
+                basic_machine=crisv32-axis
+                ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
+                ;;
+        crx)
+                basic_machine=crx-unknown
+                os=-elf
+                ;;
         da30 | da30-*)
                 basic_machine=m68k-da30
@@ -279 +541 @@
         decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                 basic_machine=mips-dec
+                ;;
+        decsystem10* | dec10*)
+                basic_machine=pdp10-dec
+                os=-tops10
+                ;;
+        decsystem20* | dec20*)
+                basic_machine=pdp10-dec
+                os=-tops20
                 ;;
         delta | 3300 | motorola-3300 | motorola-delta \
@@ -288 +558 @@
                 os=-sysv3
                 ;;
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
+                ;;
+        djgpp)
+                basic_machine=i586-pc
+                os=-msdosdjgpp
+                ;;
         dpx20 | dpx20-*)
                 basic_machine=rs6000-bull
@@ -307 +585 @@
                 basic_machine=ns32k-encore
                 ;;
+        es1800 | OSE68k | ose68k | ose | OSE)
+                basic_machine=m68k-ericsson
+                os=-ose
+                ;;
         fx2800)
                 basic_machine=i860-alliant
@@ -317 +599 @@
                 os=-sysv
                 ;;
+        go32)
+                basic_machine=i386-pc
+                os=-go32
+                ;;
         h3050r* | hiux*)
                 basic_machine=hppa1.1-hitachi
@@ -325 +611 @@
                 os=-hms
                 ;;
+        h8300xray)
+                basic_machine=h8300-hitachi
+                os=-xray
+                ;;
+        h8500hms)
+                basic_machine=h8500-hitachi
+                os=-hms
+                ;;
         harris)
                 basic_machine=m88k-harris
@@ -340 +634 @@
                 os=-hpux
                 ;;
+        hp3k9[0-9][0-9] | hp9[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
         hp9k2[0-9][0-9] | hp9k31[0-9])
                 basic_machine=m68000-hp
@@ -346 +643 @@
                 basic_machine=m68k-hp
                 ;;
-        hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+        hp9k6[0-9][0-9] | hp6[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
+        hp9k7[0-79][0-9] | hp7[0-79][0-9])
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k78[0-9] | hp78[0-9])
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[0-9][13679] | hp8[0-9][13679])
                 basic_machine=hppa1.1-hp
                 ;;
@@ -355 +666 @@
                 os=-nextstep3
                 ;;
+        hppaosf)
+                basic_machine=hppa1.1-hp
+                os=-osf
+                ;;
+        hppro)
+                basic_machine=hppa1.1-hp
+                os=-proelf
+                ;;
         i370-ibm* | ibm*)
                 basic_machine=i370-ibm
-                os=-mvs
                 ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-        i[3456]86v32)
+        i*86v32)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv32
                 ;;
-        i[3456]86v4*)
+        i*86v4*)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv4
                 ;;
-        i[3456]86v)
+        i*86v)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv
                 ;;
-        i[3456]86sol2)
+        i*86sol2)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-solaris2
+                ;;
+        i386mach)
+                basic_machine=i386-mach
+                os=-mach
+                ;;
+        i386-vsta | vsta)
+                basic_machine=i386-unknown
+                os=-vsta
                 ;;
         iris | iris4d)
@@ -390 +716 @@
                 os=-sysv
                 ;;
-        macppc*)
-                basic_machine=powerpc-apple
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
                 ;;
         m88k-omron*)
@@ -404 +735 @@
                 os=-sysv
                 ;;
+        microblaze)
+                basic_machine=microblaze-xilinx
+                ;;
+        mingw32)
+                basic_machine=i386-pc
+                os=-mingw32
+                ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
-        mipsel*-linux*)
-                basic_machine=mipsel-unknown
-                os=-linux-gnu
-                ;;
-        mips*-linux*)
-                basic_machine=mips-unknown
-                os=-linux-gnu
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
+        mipsEE* | ee | ps2)
+                basic_machine=mips64r5900el-scei
+                case $os in
+                    -linux*)
+                        ;;
+                    *)
+                        os=-elf
+                        ;;
+                esac
+                ;;
+        iop)
+                basic_machine=mipsel-scei
+                os=-irx
+                ;;
+        dvp)
+                basic_machine=dvp-scei
+                os=-elf
                 ;;
         mips3*-*)
@@ -420 +776 @@
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                ;;
+        monitor)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
+        morphos)
+                basic_machine=powerpc-unknown
+                os=-morphos
+                ;;
+        msdos)
+                basic_machine=i386-pc
+                os=-msdos
+                ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
                 ;;
         ncr3000)
@@ -425 +800 @@
                 os=-sysv4
                 ;;
+        netbsd386)
+                basic_machine=i386-unknown
+                os=-netbsd
+                ;;
+        netwinder)
+                basic_machine=armv4l-rebel
+                os=-linux
+                ;;
         news | news700 | news800 | news900)
                 basic_machine=m68k-sony
@@ -436 +819 @@
                 basic_machine=mips-sony
                 os=-newsos
+                ;;
+        necv70)
+                basic_machine=v70-nec
+                os=-sysv
                 ;;
         next | m*-next )
@@ -462 +849 @@
                 os=-nindy
                 ;;
+        mon960)
+                basic_machine=i960-intel
+                os=-mon960
+                ;;
+        nonstopux)
+                basic_machine=mips-compaq
+                os=-nonstopux
+                ;;
         np1)
                 basic_machine=np1-gould
+                ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
+        op50n-* | op60c-*)
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        openrisc | openrisc-*)
+                basic_machine=or32-unknown
+                ;;
+        os400)
+                basic_machine=powerpc-ibm
+                os=-os400
+                ;;
+        OSE68000 | ose68000)
+                basic_machine=m68000-ericsson
+                os=-ose
+                ;;
+        os68k)
+                basic_machine=m68k-none
+                os=-os68k
                 ;;
         pa-hitachi)
@@ -473 +890 @@
                 os=-osf
                 ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         pbd)
                 basic_machine=sparc-tti
@@ -479 +904 @@
                 basic_machine=m68k-tti
                 ;;
-        pc532 | pc532-*)
+        pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentiummmx | p55)
-                basic_machine=pentiummmx-pc
-                ;;
-        pentium | p5 | i586)
-                basic_machine=pentium-pc
-                ;;
-        pentiumpro | p6)
-                basic_machine=pentiumpro-pc
-                ;;
-        pentiummmx-* | p55-*)
-                basic_machine=pentiummmx-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentium-* | p5-* | i586-*)
-                basic_machine=pentium-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentiumpro-* | p6-*)
-                basic_machine=pentiumpro-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        nexen)
-                # We don't have specific support for Nexgen yet, so just call it a Pentium
-                basic_machine=i586-nexgen
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium | p5 | k5 | k6 | nexgen | viac3)
+                basic_machine=i586-pc
+                ;;
+        pentiumpro | p6 | 6x86 | athlon | athlon_*)
+                basic_machine=i686-pc
+                ;;
+        pentiumii | pentium2 | pentiumiii | pentium3)
+                basic_machine=i686-pc
+                ;;
+        pentium4)
+                basic_machine=i786-pc
+                ;;
+        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumpro-* | p6-* | 6x86-* | athlon-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium4-*)
+                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
                 basic_machine=pn-gould
                 ;;
-        power)  basic_machine=rs6000-ibm
+        power)  basic_machine=power-ibm
                 ;;
         ppc)    basic_machine=powerpc-unknown
-                ;;
+                ;;
         ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64)  basic_machine=powerpc64-unknown
-                ;;
-        ppc64-*)
-                basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-                ;;
+                ;;
         ppcle-* | powerpclittle-*)
                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
+        ppc64)  basic_machine=powerpc64-unknown
+                ;;
+        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+                basic_machine=powerpc64le-unknown
+                ;;
+        ppc64le-* | powerpc64little-*)
+                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         ps2)
                 basic_machine=i386-ibm
                 ;;
+        pw32)
+                basic_machine=i586-unknown
+                os=-pw32
+                ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
+        rom68k)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
         rm[46]00)
                 basic_machine=mips-siemens
@@ -532 +982 @@
         rtpc | rtpc-*)
                 basic_machine=romp-ibm
+                ;;
+        s390 | s390-*)
+                basic_machine=s390-ibm
+                ;;
+        s390x | s390x-*)
+                basic_machine=s390x-ibm
+                ;;
+        sa29200)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        sb1)
+                basic_machine=mipsisa64sb1-unknown
+                ;;
+        sb1el)
+                basic_machine=mipsisa64sb1el-unknown
+                ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
+                ;;
+        sei)
+                basic_machine=mips-sei
+                os=-seiux
                 ;;
         sequent)
@@ -540 +1014 @@
                 os=-hms
                 ;;
+        sh5el)
+                basic_machine=sh5le-unknown
+                ;;
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
+        sparclite-wrs | simso-wrs)
+                basic_machine=sparclite-wrs
+                os=-vxworks
+                ;;
         sps7)
                 basic_machine=m68k-bull
@@ -547 +1031 @@
                 basic_machine=spur-unknown
                 ;;
+        st2000)
+                basic_machine=m68k-tandem
+                ;;
+        stratus)
+                basic_machine=i860-stratus
+                os=-sysv4
+                ;;
         sun2)
                 basic_machine=m68000-sun
@@ -587 +1078 @@
                 basic_machine=i386-sun
                 ;;
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
+                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
+        t3e)
+                basic_machine=alphaev5-cray
+                os=-unicos
+                ;;
+        t90)
+                basic_machine=t90-cray
+                os=-unicos
+                ;;
+        tic54x | c54x*)
+                basic_machine=tic54x-unknown
+                os=-coff
+                ;;
+        tic55x | c55x*)
+                basic_machine=tic55x-unknown
+                os=-coff
+                ;;
+        tic6x | c6x*)
+                basic_machine=tic6x-unknown
+                os=-coff
+                ;;
+        # This must be matched before tile*.
+        tilegx*)
+                basic_machine=tilegx-unknown
+                os=-linux-gnu
+                ;;
+        tile*)
+                basic_machine=tile-unknown
+                os=-linux-gnu
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
@@ -597 +1121 @@
                 basic_machine=mipstx39el-unknown
                 ;;
+        toad1)
+                basic_machine=pdp10-xkl
+                os=-tops20
+                ;;
         tower | tower-32)
                 basic_machine=m68k-ncr
+                ;;
+        tpf)
+                basic_machine=s390x-ibm
+                os=-tpf
                 ;;
         udi29k)
@@ -608 +1140 @@
                 os=-sym1
                 ;;
+        v810 | necv810)
+                basic_machine=v810-nec
+                os=-none
+                ;;
         vaxv)
                 basic_machine=vax-dec
@@ -617 +1153 @@
                 ;;
         vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+                basic_machine=f301-fujitsu
+                ;;
         vxworks960)
                 basic_machine=i960-wrs
@@ -631 +1167 @@
                 os=-vxworks
                 ;;
-        xmp)
-                basic_machine=xmp-cray
+        w65*)
+                basic_machine=w65-wdc
+                os=-none
+                ;;
+        w89k-*)
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
+        xbox)
+                basic_machine=i686-pc
+                os=-mingw32
+                ;;
+        xps | xps100)
+                basic_machine=xps100-honeywell
+                ;;
+        ymp)
+                basic_machine=ymp-cray
                 os=-unicos
                 ;;
-        xps | xps100)
-                basic_machine=xps100-honeywell
+        z8k-*-coff)
+                basic_machine=z8k-unknown
+                os=-sim
+                ;;
+        z80-*-coff)
+                basic_machine=z80-unknown
+                os=-sim
                 ;;
         none)
@@ -645 +1201 @@
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-        mips)
-                if [ x$os = x-linux-gnu ]; then
-                        basic_machine=mips-unknown
-                else
-                        basic_machine=mips-mips
-                fi
+        w89k)
+                basic_machine=hppa1.1-winbond
+                ;;
+        op50n)
+                basic_machine=hppa1.1-oki
+                ;;
+        op60c)
+                basic_machine=hppa1.1-oki
                 ;;
         romp)
                 basic_machine=romp-ibm
                 ;;
+        mmix)
+                basic_machine=mmix-knuth
+                ;;
         rs6000)
                 basic_machine=rs6000-ibm
@@ -661 +1222 @@
                 basic_machine=vax-dec
                 ;;
+        pdp10)
+                # there are many clones, so DEC is not a safe bet
+                basic_machine=pdp10-unknown
+                ;;
         pdp11)
                 basic_machine=pdp11-dec
@@ -667 +1232 @@
                 basic_machine=we32k-att
                 ;;
-        sparc)
+        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+                basic_machine=sh-unknown
+                ;;
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
-        cydra)
+        cydra)
                 basic_machine=cydra-cydrome
                 ;;
@@ -678 +1246 @@
         orion105)
                 basic_machine=clipper-highlevel
+                ;;
+        mac | mpw | mac-mpw)
+                basic_machine=m68k-apple
+                ;;
+        pmac | pmac-mpw)
+                basic_machine=powerpc-apple
+                ;;
+        *-unknown)
+                # Make sure to match an already-canonicalized machine name.
                 ;;
         *)
@@ -705 +1282 @@
         # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+                os=-auroraux
+                ;;
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -725 +1305 @@
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-              | -aos* \
+              | -aos* | -aros* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -openbsd* | -solidbsd* \
+              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-              | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -uxpv*)
+              | -chorusos* | -chorusrdb* | -cegcc* \
+              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
+              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
         # Remember, each alternative MUST END IN *, to match a version number.
+                ;;
+        -qnx*)
+                case $basic_machine in
+                    x86-* | i*86-*)
+                        ;;
+                    *)
+                        os=-nto$os
+                        ;;
+                esac
+                ;;
+        -nto-qnx*)
+                ;;
+        -nto*)
+                os=`echo $os | sed -e 's|nto|nto-qnx|'`
+                ;;
+        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+                ;;
+        -mac*)
+                os=`echo $os | sed -e 's|mac|macos|'`
+                ;;
+        -linux-dietlibc)
+                os=-linux-dietlibc
                 ;;
         -linux*)
@@ -748 +1364 @@
                 os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
+        -opened*)
+                os=-openedition
+                ;;
+        -os400*)
+                os=-os400
+                ;;
+        -wince*)
+                os=-wince
+                ;;
         -osfrose*)
                 os=-osfrose
@@ -763 +1388 @@
                 os=-aos
                 ;;
+        -atheos*)
+                os=-atheos
+                ;;
+        -syllable*)
+                os=-syllable
+                ;;
+        -386bsd)
+                os=-bsd
+                ;;
         -ctix* | -uts*)
                 os=-sysv
                 ;;
+        -nova*)
+                os=-rtmk-nova
+                ;;
         -ns2 )
-                os=-nextstep2
+                os=-nextstep2
+                ;;
+        -nsk*)
+                os=-nsk
                 ;;
         # Preserve the version number of sinix5.
@@ -776 +1416 @@
                 os=-sysv4
                 ;;
+        -tpf*)
+                os=-tpf
+                ;;
         -triton*)
                 os=-sysv3
@@ -794 +1437 @@
         -sysv*)
                 ;;
+        -ose*)
+                os=-ose
+                ;;
+        -es1800*)
+                os=-ose
+                ;;
         -xenix)
                 os=-xenix
                 ;;
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
+                ;;
+        -aros*)
+                os=-aros
+                ;;
+        -kaos*)
+                os=-kaos
+                ;;
+        -zvmoe)
+                os=-zvmoe
+                ;;
+        -dicos*)
+                os=-dicos
+                ;;
+        -nacl*)
+                ;;
         -none)
                 ;;
@@ -819 +1485 @@
 
 case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
                 ;;
+        arm*-rebel)
+                os=-linux
+                ;;
         arm*-semi)
                 os=-aout
                 ;;
-        pdp11-*)
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
+        # This must come before the *-dec entry.
+        pdp10-*)
+                os=-tops20
+                ;;
+        pdp11-*)
                 os=-none
                 ;;
@@ -843 +1525 @@
                 # os=-sunos4
                 ;;
+        m68*-cisco)
+                os=-aout
+                ;;
+        mep-*)
+                os=-elf
+                ;;
+        mips*-cisco)
+                os=-elf
+                ;;
+        mips*-*)
+                os=-elf
+                ;;
+        or32-*)
+                os=-coff
+                ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
@@ -849 +1546 @@
                 os=-sunos4.1.1
                 ;;
+        *-be)
+                os=-beos
+                ;;
+        *-haiku)
+                os=-haiku
+                ;;
         *-ibm)
                 os=-aix
                 ;;
+        *-knuth)
+                os=-mmixware
+                ;;
+        *-wec)
+                os=-proelf
+                ;;
+        *-winbond)
+                os=-proelf
+                ;;
+        *-oki)
+                os=-proelf
+                ;;
         *-hp)
                 os=-hpux
@@ -894 +1609 @@
                 os=-nextstep3
                 ;;
-        *-gould)
+        *-gould)
                 os=-sysv
                 ;;
-        *-highlevel)
+        *-highlevel)
                 os=-bsd
                 ;;
@@ -903 +1618 @@
                 os=-bsd
                 ;;
-        *-sgi)
+        *-sgi)
                 os=-irix
                 ;;
-        *-siemens)
+        *-siemens)
                 os=-sysv4
                 ;;
@@ -912 +1627 @@
                 os=-rtu
                 ;;
-        f301-fujitsu)
+        f30[01]-fujitsu | f700-fujitsu)
                 os=-uxpv
+                ;;
+        *-rom68k)
+                os=-coff
+                ;;
+        *-*bug)
+                os=-coff
+                ;;
+        *-apple)
+                os=-macos
+                ;;
+        *-atari*)
+                os=-mint
                 ;;
         *)
@@ -933 +1660 @@
                                 vendor=sun
                                 ;;
-                        -aix*)
+                        -cnk*|-aix*)
                                 vendor=ibm
+                                ;;
+                        -beos*)
+                                vendor=be
                                 ;;
                         -hpux*)
                                 vendor=hp
                                 ;;
+                        -mpeix*)
+                                vendor=hp
+                                ;;
                         -hiux*)
                                 vendor=hitachi
@@ -954 +1687 @@
                                 vendor=ns
                                 ;;
-                        -mvs*)
+                        -mvs* | -opened*)
+                                vendor=ibm
+                                ;;
+                        -os400*)
                                 vendor=ibm
                                 ;;
@@ -960 +1696 @@
                                 vendor=sequent
                                 ;;
-                        -vxsim* | -vxworks*)
+                        -tpf*)
+                                vendor=ibm
+                                ;;
+                        -vxsim* | -vxworks* | -windiss*)
                                 vendor=wrs
                                 ;;
@@ -966 +1705 @@
                                 vendor=apple
                                 ;;
+                        -hms*)
+                                vendor=hitachi
+                                ;;
+                        -mpw* | -macos*)
+                                vendor=apple
+                                ;;
+                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                                vendor=atari
+                                ;;
+                        -vos*)
+                                vendor=stratus
+                                ;;
                 esac
                 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
@@ -972 +1723 @@
 
 echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End: