Changeset 5f32e0b in git

Timestamp:

Jun 20, 2003, 6:40:04 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f1eb3fef71d066c8f429ed0be5b11f2f8677c577

Parents:

63d3510e4ce4338f12303edb034a00e101e2fe36

Message:

*hannes: ports


git-svn-id: file:///usr/local/Singular/svn/trunk@6813 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

MP

Files:

• config.guess (modified) (28 diffs)
• config.sub (modified) (53 diffs)
• pvmgetarch (modified) (1 diff)

MP/config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
-#
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-03-20'
+
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -22 +25 @@
 # 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 <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
@@ -30 +34 @@
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of 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
+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 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # 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
+
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+        for c in cc gcc c89 c99 ; do
+          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+          if test $? = 0 ; then
+             CC_FOR_BUILD="$c"; break ;
+          fi ;
+        done ;
+        rm -f $dummy.c $dummy.o $dummy.rel ;
+        if test x"$CC_FOR_BUILD" = x ; then
+          CC_FOR_BUILD=no_compiler_found ;
+        fi
+        ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
         PATH=$PATH:/.attbin ; export PATH
@@ -44 +122 @@
 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
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:[VX]*:*)
-        # After 1.2, OSF1 uses "V1.3" for uname -r.
-        # After 4.x, OSF1 uses "X4.x" for uname -r.
-        echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VX]//'`
+    *: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
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        esac
+        # The Operating System including object format, if it has switched
+        # to ELF recently, or will in the future.
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+                eval $set_cc_for_build
+                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                        | grep __ELF__ >/dev/null
+                then
+                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                    # Return netbsd for either.  FIX?
+                    os=netbsd
+                else
+                    os=netbsdelf
+                fi
+                ;;
+            *)
+                os=netbsd
+                ;;
+        esac
+        # The OS release
+        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+        # contains redundant information, the shorter form:
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}${release}"
+        exit 0 ;;
+    amiga:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    arc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    hp300:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mac68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    macppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    pmax:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sgi:OpenBSD:*:*)
+        echo mipseb-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sun3:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    *:OpenBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
     alpha:OSF1:*:*)
+        if test $UNAME_RELEASE = "V4.0"; then
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+        fi
+        # 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.
-        echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
+        cat <<EOF >$dummy.s
+        .data
+\$Lformat:
+        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+        .text
+        .globl main
+        .align 4
+        .ent main
+main:
+        .frame \$30,16,\$26,0
+        ldgp \$29,0(\$27)
+        .prologue 1
+        .long 0x47e03d80 # implver \$0
+        lda \$2,-1
+        .long 0x47e20c21 # amask \$2,\$1
+        lda \$16,\$Lformat
+        mov \$0,\$17
+        not \$1,\$18
+        jsr \$26,printf
+        ldgp \$29,0(\$26)
+        mov 0,\$16
+        jsr \$26,exit
+        .end main
+EOF
+        eval $set_cc_for_build
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                case `./$dummy` in
+                        0-0)
+                                UNAME_MACHINE="alpha"
+                                ;;
+                        1-0)
+                                UNAME_MACHINE="alphaev5"
+                                ;;
+                        1-1)
+                                UNAME_MACHINE="alphaev56"
+                                ;;
+                        1-101)
+                                UNAME_MACHINE="alphapca56"
+                                ;;
+                        2-303)
+                                UNAME_MACHINE="alphaev6"
+                                ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
+                        2-1307)
+                                UNAME_MACHINE="alphaev68"
+                                ;;
+                esac
+        fi
+        rm -f $dummy.s $dummy
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        exit 0 ;;
+    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 0 ;;
     21064:Windows_NT:50:3)
         echo alpha-dec-winnt3.5
         exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-cbm-sysv4
+        echo m68k-unknown-sysv4
         exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-amigaos
+        exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-morphos
+        exit 0 ;;
+    *:OS/390:*:*)
+        echo i370-ibm-openedition
+        exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
         exit 0;;
-    Pyramid*:OSx*:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+        echo hppa1.1-hitachi-hiuxmpp
+        exit 0;;
+    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
                 echo pyramid-pyramid-sysv3
@@ -80 +311 @@
         fi
         exit 0 ;;
-    sun4*:SunOS:5.*:*)
+    NILE*:*:*:dcosx)
+        echo pyramid-pyramid-svr4
+        exit 0 ;;
+    sun4H:SunOS:5.*:*)
+        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit 0 ;;
     i86pc:SunOS:5.*:*)
-        echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit 0 ;;
     sun4*:SunOS:6*:*)
@@ -104 +341 @@
         echo m68k-sun-sunos${UNAME_RELEASE}
         exit 0 ;;
-    atari*:NetBSD:*:*)
-        echo m68k-atari-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:NetBSD:*:*)
-        echo m68k-sun-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:NetBSD:*:*)
-        echo m68k-apple-netbsd${UNAME_RELEASE}
+    sun*:*:4.2BSD:*)
+        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
+            sun3)
+                echo m68k-sun-sunos${UNAME_RELEASE}
+                ;;
+            sun4)
+                echo sparc-sun-sunos${UNAME_RELEASE}
+                ;;
+        esac
+        exit 0 ;;
+    aushp:SunOS:*:*)
+        echo sparc-auspex-sunos${UNAME_RELEASE}
+        exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > 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 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+        echo powerpc-apple-machten${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+        echo mips-dec-mach_bsd4.3
         exit 0 ;;
     RISC*:ULTRIX:*:*)
@@ -119 +394 @@
         echo vax-dec-ultrix${UNAME_RELEASE}
         exit 0 ;;
-    mips:*:4*:UMIPS)
-        echo mips-mips-riscos4sysv
-        exit 0 ;;
-    mips:*:5*:RISCos)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+        echo clipper-intergraph-clix${UNAME_RELEASE}
+        exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        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)
+          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+        #endif
+        #if defined (SYSTYPE_SVR4)
+          printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+        #endif
+        #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+          printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+        #endif
+        #endif
+          exit (-1);
+        }
+EOF
+        $CC_FOR_BUILD $dummy.c -o $dummy \
+          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo mips-mips-riscos${UNAME_RELEASE}
+        exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+        echo powerpc-motorola-powermax
         exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -139 +443 @@
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
-        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-             -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        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
+            echo i586-dg-dgux${UNAME_RELEASE}
+        fi
         exit 0 ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -166 +473 @@
         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
         exit 0 ;;
-   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+    ????????: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[34]86:AIX:*:*)
+    i*86:AIX:*:*)
         echo i386-ibm-aix
+        exit 0 ;;
+    ia64:AIX:*:*)
+        if [ -x /usr/bin/oslevel ] ; then
+                IBM_REV=`/usr/bin/oslevel`
+        else
+                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+        fi
+        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
         exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                sed 's/^                //' << EOF >dummy.c
+                eval $set_cc_for_build
+                sed 's/^                //' << EOF >$dummy.c
                 #include <sys/systemcfg.h>
 
@@ -185 +501 @@
                         }
 EOF
-                ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-                rm -f dummy.c dummy
+                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+                rm -f $dummy.c $dummy
                 echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -194 +510 @@
         fi
         exit 0 ;;
-    *:AIX:*:4)
-        if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+    *:AIX:*:[45])
+        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
@@ -203 +520 @@
                 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}
@@ -213 +530 @@
         echo romp-ibm-bsd4.4
         exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
+    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
     *:BOSX:*:*)
@@ -228 +545 @@
         echo m68k-hp-bsd4.4
         exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    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/7?? | 9000/8?[679] ) 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 $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+                    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+                    rm -f $dummy.c $dummy
+                fi ;;
         esac
+        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+        exit 0 ;;
+    ia64:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+        echo ia64-hp-hpux${HPUX_REV}
         exit 0 ;;
     3050*:HI-UX:*:*)
-        sed 's/^        //' << EOF >dummy.c
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
         int
@@ -264 +638 @@
         }
 EOF
-        ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-        rm -f dummy.c dummy
+        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
@@ -274 +648 @@
         echo hppa1.0-hp-bsd
         exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+        echo hppa1.0-hp-mpeix
+        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
@@ -279 +656 @@
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
+        exit 0 ;;
+    i*86:OSF1:*:*)
+        if [ -x /usr/sbin/sysversion ] ; then
+            echo ${UNAME_MACHINE}-unknown-osf1mk
+        else
+            echo ${UNAME_MACHINE}-unknown-osf1
+        fi
         exit 0 ;;
     parisc*:Lites*:*:*)
@@ -301 +685 @@
         echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-        echo xmp-cray-unicos
+    CRAY*Y-MP:*:*:*)
+        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+              -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*TS:*:*:*)
+        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*T3D:*:*:*)
+        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*T3E:*:*:*)
+        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*SV1:*:*:*)
+        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    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 "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE}
-        exit 0 ;;
-    CRAY*C90:*:*:*)
-        echo c90-cray-unicos${UNAME_RELEASE}
-        exit 0 ;;
-    CRAY-2:*:*:*)
-        echo cray2-cray-unicos
-        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-        echo m68k-hp-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+        exit 0 ;;
+    sparc*:BSD/OS:*:*)
+        echo sparc-unknown-bsdi${UNAME_RELEASE}
+        exit 0 ;;
+    *:BSD/OS:*:*)
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
@@ -322 +724 @@
         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
-    *:NetBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
     i*:CYGWIN*:*)
-        echo i386-unknown-cygwin32
+        echo ${UNAME_MACHINE}-pc-cygwin
+        exit 0 ;;
+    i*:MINGW*:*)
+        echo ${UNAME_MACHINE}-pc-mingw32
+        exit 0 ;;
+    i*:PW*:*)
+        echo ${UNAME_MACHINE}-pc-pw32
+        exit 0 ;;
+    x86:Interix*:3*)
+        echo i386-pc-interix3
+        exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+        # How do we know it's Interix rather than the generic POSIX subsystem?
+        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+        # UNAME_MACHINE based on the output of uname instead of i386?
+        echo i386-pc-interix
+        exit 0 ;;
+    i*:UWIN*:*)
+        echo ${UNAME_MACHINE}-pc-uwin
         exit 0 ;;
     p*:CYGWIN*:*)
-        echo powerpcle-unknown-cygwin32
+        echo powerpcle-unknown-cygwin
+        exit 0 ;;
+    prep*:SunOS:5.*:*)
+        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit 0 ;;
     *:GNU:*:*)
-        echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit 0 ;;
-    *:Linux:*:*)
+        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        exit 0 ;;
+    i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit 0 ;;
+    arm*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    ia64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    m68*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    mips:Linux:*:*)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #undef CPU
+        #undef mips
+        #undef mipsel
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+        CPU=mipsel
+        #else
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+        CPU=mips
+        #else
+        CPU=
+        #endif
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        rm -f $dummy.c
+        test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+        ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-gnu
+        exit 0 ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-gnu
+        exit 0 ;;
+    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 ld.so.1 >/dev/null
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+        # Look for CPU level
+        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+          PA7*) echo hppa1.1-unknown-linux-gnu ;;
+          PA8*) echo hppa2.0-unknown-linux-gnu ;;
+          *)    echo hppa-unknown-linux-gnu ;;
+        esac
+        exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-gnu
+        exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+        echo ${UNAME_MACHINE}-ibm-linux
+        exit 0 ;;
+    sh*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit 0 ;;
+    x86_64:Linux:*:*)
+        echo x86_64-unknown-linux-gnu
+        exit 0 ;;
+    i*86:Linux:*:*)
         # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us.
-        ld_help_string=`ld --help 2>&1`
-        if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
-          echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-        elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
-          echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-        elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
-          echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
-        elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-          echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-        elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-          echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-        elif test "${UNAME_MACHINE}" = "alpha" ; then
-          echo alpha-unknown-linux ; exit 0
+        # first see if it will tell us. cd to the root directory to prevent
+        # problems with other programs or directories called `ld' in the path.
+        # Set LC_ALL=C to ensure ld outputs messages in English.
+        ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+                         | sed -ne '/supported targets:/!d
+                                    s/[         ][      ]*/ /g
+                                    s/.*supported targets: *//
+                                    s/ .*//
+                                    p'`
+        case "$ld_supported_targets" in
+          elf32-i386)
+                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+                ;;
+          a.out-i386-linux)
+                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+                exit 0 ;;               
+          coff-i386)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                exit 0 ;;
+          "")
+                # Either a pre-BFD a.out linker (linux-gnuoldld) or
+                # one that does not give us useful --help.
+                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+                exit 0 ;;
+        esac
+        # Determine whether the default compiler is a.out or elf
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #ifdef __ELF__
+        # ifdef __GLIBC__
+        #  if __GLIBC__ >= 2
+        LIBC=gnu
+        #  else
+        LIBC=gnulibc1
+        #  endif
+        # else
+        LIBC=gnulibc1
+        # endif
+        #else
+        #ifdef __INTEL_COMPILER
+        LIBC=gnu
+        #else
+        LIBC=gnuaout
+        #endif
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        rm -f $dummy.c
+        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+        ;;
+    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.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+        # I just have to hope.  -- rms.
+        # 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.*:*)
+        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
         else
-          # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-          # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-          test ! -d /usr/lib/ldscripts/. \
-            && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
-          # Determine whether the default compiler is a.out or elf
-          cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
-  printf ("%s-unknown-linux\n", argv[1]);
-#else
-  printf ("%s-unknown-linuxaout\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[34]86:DYNIX/ptx:4*:*)
-        echo i386-sequent-sysv4
-        exit 0 ;;
-    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
-        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-                echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-        else
-                echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
-        fi
-        exit 0 ;;
-    i[34]86:*:3.2:*)
+                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+        fi
+        exit 0 ;;
+    i*86:*:5:[78]*)
+        case `/bin/uname -X | grep "^Machine"` in
+            *486*)           UNAME_MACHINE=i486 ;;
+            *Pentium)        UNAME_MACHINE=i586 ;;
+            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+        esac
+        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+        exit 0 ;;
+    i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-                echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+                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/.*= //')`
@@ -393 +922 @@
                 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
                         && UNAME_MACHINE=i586
-                echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+                (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+                        && UNAME_MACHINE=i686
+                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+                        && UNAME_MACHINE=i686
+                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
         else
-                echo ${UNAME_MACHINE}-unknown-sysv32
-        fi
-        exit 0 ;;
+                echo ${UNAME_MACHINE}-pc-sysv32
+        fi
+        exit 0 ;;
+    i*86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
+        exit 0 ;;
+    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 ;;
     Intel:Mach:3*:*)
-        echo i386-unknown-mach3
+        echo i386-pc-mach3
         exit 0 ;;
     paragon:*:*:*)
@@ -415 +957 @@
         echo m68010-convergent-sysv
         exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+        OS_REL=''
+        test -r /etc/.relid \
+        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+          && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m680[234]0:LynxOS:2.[23]*:*)
-        echo m68k-lynx-lynxos${UNAME_RELEASE}
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+        echo m68k-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
         exit 0 ;;
-    i[34]86:LynxOS:2.[23]*:*)
-        echo i386-lynx-lynxos${UNAME_RELEASE}
-        exit 0 ;;
-    TSUNAMI:LynxOS:2.[23]*:*)
-        echo sparc-lynx-lynxos${UNAME_RELEASE}
-        exit 0 ;;
-    rs6000:LynxOS:2.[23]*:*)
-        echo rs6000-lynx-lynxos${UNAME_RELEASE}
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+        echo i386-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+        echo sparc-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+        echo rs6000-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+        echo mips-dde-sysv${UNAME_RELEASE}
+        exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+        echo mips-sni-sysv4
         exit 0 ;;
     RM*:SINIX-*:*:*)
@@ -449 +1005 @@
         fi
         exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+        # From Gerald Hewes <hewes@openmarket.com>.
+        # How about differentiating between stratus architectures? -djm
+        echo hppa1.1-stratus-sysv4
+        exit 0 ;;
+    *:*:*:FTX*)
+        # From seanf@swdc.stratus.com.
+        echo i860-stratus-sysv4
+        exit 0 ;;
+    *:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo hppa1.1-stratus-vos
+        exit 0 ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
         exit 0 ;;
+    news*:NEWS-OS:6*:*)
+        echo mips-sony-newsos6
+        exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+        if [ -d /usr/nec ]; then
+                echo mips-nec-sysv${UNAME_RELEASE}
+        else
+                echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
+        echo powerpc-be-beos
+        exit 0 ;;
+    BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
+        echo powerpc-apple-beos
+        exit 0 ;;
+    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
+        echo i586-pc-beos
+        exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+        echo sx4-nec-superux${UNAME_RELEASE}
+        exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+        echo sx5-nec-superux${UNAME_RELEASE}
+        exit 0 ;;
+    Power*:Rhapsody:*:*)
+        echo powerpc-apple-rhapsody${UNAME_RELEASE}
+        exit 0 ;;
+    *:Rhapsody:*:*)
+        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+        exit 0 ;;
+    *:Darwin:*:*)
+        echo `uname -p`-apple-darwin${UNAME_RELEASE}
+        exit 0 ;;
+    *: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 0 ;;
+    *:QNX:*:4*)
+        echo i386-pc-qnx
+        exit 0 ;;
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+        echo nsr-tandem-nsk${UNAME_RELEASE}
+        exit 0 ;;
+    *:NonStop-UX:*:*)
+        echo mips-compaq-nonstopux
+        exit 0 ;;
+    BS2000:POSIX*:*:*)
+        echo bs2000-siemens-sysv
+        exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+        exit 0 ;;
+    *:Plan9:*:*)
+        # "uname -m" is not consistent, so use $cputype instead. 386
+        # is converted to i386 for consistency with other x86
+        # operating systems.
+        if test "$cputype" = "386"; then
+            UNAME_MACHINE=i386
+        else
+            UNAME_MACHINE="$cputype"
+        fi
+        echo ${UNAME_MACHINE}-unknown-plan9
+        exit 0 ;;
+    i*86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit 0 ;;
+    *:TOPS-10:*:*)
+        echo pdp10-unknown-tops10
+        exit 0 ;;
+    *:TENEX:*:*)
+        echo pdp10-unknown-tenex
+        exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+        echo pdp10-dec-tops20
+        exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+        echo pdp10-xkl-tops20
+        exit 0 ;;
+    *:TOPS-20:*:*)
+        echo pdp10-unknown-tops20
+        exit 0 ;;
+    *:ITS:*:*)
+        echo pdp10-unknown-its
+        exit 0 ;;
+    i*86:XTS-300:*:STOP)
+        echo ${UNAME_MACHINE}-unknown-stop
+        exit 0 ;;
+    i*86:atheos:*:*)
+        echo ${UNAME_MACHINE}-unknown-atheos
+        exit 0 ;;
 esac
 
@@ -457 +1127 @@
 #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>
@@ -495 +1166 @@
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
@@ -512 +1186 @@
 
 #if defined (__386BSD__)
-  printf ("i386-unknown-bsd\n"); exit (0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif
 
@@ -540 +1214 @@
 
 #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
 
@@ -555 +1242 @@
 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 $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
@@ -588 +1275 @@
 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
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+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:

MP/config.sub

@@ -1 +1 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-09-07'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can. 
+# can handle that machine.  It does not imply ALL GNU software can.
 #
 # This file is free software; you can redistribute it and/or modify
@@ -26 +30 @@
 # the same distribution terms that you use for the rest of that program.
 
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -42 +48 @@
 # machine specification into a single specification in the form:
 #       CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#       CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # 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
+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 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # 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 0;;
+
+    * )
+       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
 
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
 ### Let's recognize common machines as not being operating systems so
@@ -82 +143 @@
         -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
+        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+        -apple | -axis)
                 os=
                 basic_machine=$1
                 ;;
-        -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
+        -sim | -cisco | -oki | -wec | -winbond)
                 os=
                 basic_machine=$1
                 ;;
-        -apple*)                                        # CYGNUS LOCAL
-                os=
+        -scout)
+                ;;
+        -wrs)
+                os=-vxworks
                 basic_machine=$1
                 ;;
-        -scout)                                         # CYGNUS LOCAL
-                ;;
-        -wrs)                                           # CYGNUS LOCAL
-                os=vxworks
+        -chorusos*)
+                os=-chorusos
                 basic_machine=$1
                 ;;
+        -chorusrdb)
+                os=-chorusrdb
+                basic_machine=$1
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
+        -sco5)
+                os=-sco3.2v5
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco4)
                 os=-sco3.2v4
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco3.2.[4-9]*)
                 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco3.2v[4-9]*)
                 # Don't forget version if it is 3.2v4 or newer.
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco*)
                 os=-sco3.2v2
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                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
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -clix*)
@@ -127 +200 @@
                 ;;
         -isc*)
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -lynx*)
@@ -137 +210 @@
         -windowsnt*)
                 os=`echo $os | sed -e 's/windowsnt/winnt/'`
+                ;;
+        -psos*)
+                os=-psos
+                ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
                 ;;
 esac
@@ -144 +224 @@
         # Recognize the basic CPU types without company name.
         # Some are omitted here because they have special meanings below.
-        tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | armeb \
-                | armel | pyramid \
-                | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
-                | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
-                | powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
-                | pdp11 | mips64el | mips64orion | mips64orionel \
-                | sparc | supersparc | microsparc | ultrasparc)
+        1750a | 580 \
+        | a29k \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | c4x | clipper \
+        | d10v | d30v | dsp16xx \
+        | fr30 \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | i370 | i860 | i960 | ia64 \
+        | m32r | m68000 | m68k | m88k | mcore \
+        | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+        | mips64vr4100 | mips64vr4100el | mips64vr4300 \
+        | mips64vr4300el | mips64vr5000 | mips64vr5000el \
+        | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+        | mipsisa32 \
+        | mn10200 | mn10300 \
+        | ns16k | ns32k \
+        | openrisc \
+        | pdp10 | pdp11 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | pyramid \
+        | s390 | s390x \
+        | sh | sh[34] | sh[34]eb | shbe | shle \
+        | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+        | stormy16 | strongarm \
+        | tahoe | thumb | tic80 | tron \
+        | v850 \
+        | we32k \
+        | x86 | xscale \
+        | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
-        m88110 | m680[012346]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
+        m6811 | m68hc11 | m6812 | m68hc12)
+                # Motorola 68HC11/12.
                 basic_machine=$basic_machine-unknown
-                ;;
-        mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith
-                basic_machine=$basic_machine-unknown
-                ;;
+                os=-none
+                ;;
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+                ;;
+
+        # 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*86 | x86_64)
+          basic_machine=$basic_machine-pc
+          ;;
         # Object if more than one company name word.
         *-*-*)
@@ -165 +276 @@
                 ;;
         # Recognize the basic CPU types with company name.
-        vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-              | sparc-* | ns32k-* | fx80-* | arm-* | arme[lb]-* | c[123]* \
-              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-              | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* \
-              | mips64-* | mipsel-* | mips64el-* | mips64orion-* \
-              | mips64orionel-* | supersparc-* | microsparc-* | ultrasparc-*)
-                ;;
-        m88110-* | m680[012346]0-* | m683?2-* | m68360-* | z8k-* | h8500-*) # CYGNUS LOCAL
-                ;;
-        mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith
+        580-* \
+        | a29k-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alphapca5[67]-* | arc-* \
+        | arm-*  | armbe-* | armle-* | armv*-* \
+        | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c54x-* \
+        | clipper-* | cray2-* | cydra-* \
+        | d10v-* | d30v-* \
+        | elxsi-* \
+        | f30[01]-* | f700-* | fr30-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | m32r-* \
+        | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+        | m88110-* | m88k-* | mcore-* \
+        | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+        | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+        | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | pyramid-* \
+        | romp-* | rs6000-* \
+        | s390-* | s390x-* \
+        | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+        | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+        | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+        | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+        | v850-* | vax-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+        | ymp-* \
+        | z8k-*)
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
-        386bsd)                                         # CYGNUS LOCAL
+        386bsd)
                 basic_machine=i386-unknown
                 os=-bsd
@@ -191 +326 @@
                 basic_machine=we32k-att
                 ;;
-        a29khif)                                        # CYGNUS LOCAL
+        a29khif)
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
-        adobe68k)                                       # CYGNUS LOCAL
+        adobe68k)
                 basic_machine=m68010-adobe
                 os=-scout
@@ -214 +349 @@
                 ;;
         amiga | amiga-*)
-                basic_machine=m68k-cbm
-                ;;
-        amigados)
-                basic_machine=m68k-cbm
-                os=-amigados
+                basic_machine=m68k-unknown
+                ;;
+        amigaos | amigados)
+                basic_machine=m68k-unknown
+                os=-amigaos
                 ;;
         amigaunix | amix)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 os=-sysv4
                 ;;
@@ -228 +363 @@
                 os=-sysv
                 ;;
-        apollo68bsd)                                    # CYGNUS LOCAL
+        apollo68bsd)
                 basic_machine=m68k-apollo
                 os=-bsd
                 ;;
-        arm | armel | armeb)
-                basic_machine=arm-arm
-                os=-aout
+        aux)
+                basic_machine=m68k-apple
+                os=-aux
                 ;;
         balance)
@@ -240 +375 @@
                 os=-dynix
                 ;;
-        [ctj]90-cray)
-                basic_machine=c90-cray
-                os=-unicos
-                ;;
         convex-c1)
                 basic_machine=c1-convex
@@ -272 +403 @@
                 os=-unicos
                 ;;
+        [cjt]90)
+                basic_machine=${basic_machine}-cray
+                os=-unicos
+                ;;
         crds | unos)
                 basic_machine=m68k-crds
+                ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
                 ;;
         da30 | da30-*)
@@ -308 +446 @@
                 basic_machine=ns32k-encore
                 ;;
-        es1800 | OSE68k | ose68k | ose | OSE)           # CYGNUS LOCAL
+        es1800 | OSE68k | ose68k | ose | OSE)
                 basic_machine=m68k-ericsson
                 os=-ose
@@ -322 +460 @@
                 os=-sysv
                 ;;
+        go32)
+                basic_machine=i386-pc
+                os=-go32
+                ;;
         h3050r* | hiux*)
                 basic_machine=hppa1.1-hitachi
@@ -330 +472 @@
                 os=-hms
                 ;;
-        h8300xray)                                      # CYGNUS LOCAL
+        h8300xray)
                 basic_machine=h8300-hitachi
                 os=-xray
                 ;;
-        h8500hms)                                       # CYGNUS LOCAL
+        h8500hms)
                 basic_machine=h8500-hitachi
                 os=-hms
@@ -353 +495 @@
                 os=-hpux
                 ;;
-        w89k-*)                                         # CYGNUS LOCAL
-                basic_machine=hppa1.1-winbond
-                os=-proelf
-                ;;
-        op50n-*)                                        # CYGNUS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        op60c-*)                                        # CYGNUS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        hppro)                                          # CYGNUS LOCAL
-                basic_machine=hppa1.1-hp
-                os=-proelf
-                ;;
+        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
@@ -375 +504 @@
                 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
                 ;;
@@ -381 +524 @@
                 basic_machine=hppa1.0-hp
                 ;;
-        hppaosf)                                        # CYGNUS LOCAL
+        hppa-next)
+                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)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+        i*86v32)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv32
                 ;;
-        i[3456]86v4*)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+        i*86v4*)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv4
                 ;;
-        i[3456]86v)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+        i*86v)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv
                 ;;
-        i[3456]86sol2)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+        i*86sol2)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-solaris2
                 ;;
-        i386mach)                                       # CYGNUS LOCAL
+        i386mach)
                 basic_machine=i386-mach
                 os=-mach
                 ;;
-        i386-vsta | vsta)                               # CYGNUS LOCAL
+        i386-vsta | vsta)
                 basic_machine=i386-unknown
                 os=-vsta
-                ;;
-        i386-go32 | go32)                               # CYGNUS LOCAL
-                basic_machine=i386-unknown
-                os=-go32
                 ;;
         iris | iris4d)
@@ -443 +588 @@
                 os=-sysv
                 ;;
+        mingw32)
+                basic_machine=i386-pc
+                os=-mingw32
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
+        mipsel*-linux*)
+                basic_machine=mipsel-unknown
+                os=-linux-gnu
+                ;;
+        mips*-linux*)
+                basic_machine=mips-unknown
+                os=-linux-gnu
+                ;;
         mips3*-*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -452 +613 @@
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
-        monitor)                                        # CYGNUS LOCAL
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
+                ;;
+        monitor)
                 basic_machine=m68k-rom68k
                 os=-coff
                 ;;
-        msdos)                                          # CYGNUS LOCAL
-                basic_machine=i386-unknown      
+        msdos)
+                basic_machine=i386-pc
                 os=-msdos
+                ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
                 ;;
         ncr3000)
@@ -465 +634 @@
                 ;;
         netbsd386)
-                basic_machine=i386-unknown              # CYGNUS LOCAL
+                basic_machine=i386-unknown
                 os=-netbsd
+                ;;
+        netwinder)
+                basic_machine=armv4l-rebel
+                os=-linux
                 ;;
         news | news700 | news800 | news900)
@@ -480 +653 @@
                 os=-newsos
                 ;;
-        necv70)                                         # CYGNUS LOCAL
+        necv70)
                 basic_machine=v70-nec
                 os=-sysv
@@ -509 +682 @@
                 os=-nindy
                 ;;
+        mon960)
+                basic_machine=i960-intel
+                os=-mon960
+                ;;
+        nonstopux)
+                basic_machine=mips-compaq
+                os=-nonstopux
+                ;;
         np1)
                 basic_machine=np1-gould
                 ;;
-        OSE68000 | ose68000)                            # CYGNUS LOCAL
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
+        op50n-* | op60c-*)
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        OSE68000 | ose68000)
                 basic_machine=m68000-ericsson
                 os=-ose
                 ;;
-        os68k)                                          # CYGNUS LOCAL
+        os68k)
                 basic_machine=m68k-none
                 os=-os68k
@@ -537 +725 @@
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5)
-                basic_machine=i586-intel
-                ;;
-        pentiumpro | p6)
-                basic_machine=i686-intel
-                ;;
-        pentium-* | p5-*)
+        pentium | p5 | k5 | k6 | nexgen)
+                basic_machine=i586-pc
+                ;;
+        pentiumpro | p6 | 6x86 | athlon)
+                basic_machine=i686-pc
+                ;;
+        pentiumii | pentium2)
+                basic_machine=i686-pc
+                ;;
+        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumpro-* | p6-*)
+        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        k5)
-                # We don't have specific support for AMD's K5 yet, so just call it a Pentium
-                basic_machine=i586-amd
-                ;;
-        nexgen)
-                # We don't have specific support for Nexgen yet, so just call it a Pentium
-                basic_machine=i586-nexgen
+        pentiumii-* | pentium2-*)
+                basic_machine=i686-`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
@@ -572 +758 @@
                 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
                 ;;
-        rom68k)                                         # CYGNUS LOCAL
+        pw32)
+                basic_machine=i586-unknown
+                os=-pw32
+                ;;
+        rom68k)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -585 +785 @@
                 basic_machine=romp-ibm
                 ;;
-        sa29200)                                        # CYGNUS LOCAL
+        sa29200)
                 basic_machine=a29k-amd
                 os=-udi
@@ -596 +796 @@
                 os=-hms
                 ;;
-        sparclite-wrs)                                  # CYGNUS LOCAL
+        sparclite-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
-                ;;
-        sparcfrw)                                       # CYGNUS LOCAL
-                basic_machine=sparcfrw-sun
-                os=-sunos4
-                ;;
-        sparcfrwcompat)                                 # CYGNUS LOCAL
-                basic_machine=sparcfrwcompat-sun
-                os=-sunos4
-                ;;
-        sparclitefrw)                                   # CYGNUS LOCAL
-                basic_machine=sparclitefrw-fujitsu
-                ;;
-        sparclitefrwcompat)                             # CYGNUS LOCAL
-                basic_machine=sparclitefrwcompat-fujitsu
                 ;;
         sps7)
@@ -621 +807 @@
                 basic_machine=spur-unknown
                 ;;
-        st2000)                                         # CYGNUS LOCAL
+        st2000)
                 basic_machine=m68k-tandem
                 ;;
-        stratus)                                        # CYGNUS LOCAL
+        stratus)
                 basic_machine=i860-stratus
                 os=-sysv4
@@ -668 +854 @@
                 basic_machine=i386-sun
                 ;;
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
+                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
+        t3e)
+                basic_machine=t3e-cray
+                os=-unicos
+                ;;
+        tic54x | c54x*)
+                basic_machine=tic54x-unknown
+                os=-coff
+                ;;
+        tx39)
+                basic_machine=mipstx39-unknown
+                ;;
+        tx39el)
+                basic_machine=mipstx39el-unknown
+                ;;
         tower | tower-32)
                 basic_machine=m68k-ncr
@@ -683 +887 @@
                 os=-sym1
                 ;;
-        v810 | necv810)                                 # CYGNUS LOCAL
+        v810 | necv810)
                 basic_machine=v810-nec
                 os=-none
@@ -695 +899 @@
                 os=-vms
                 ;;
+        vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
         vxworks960)
                 basic_machine=i960-wrs
@@ -703 +910 @@
                 os=-vxworks
                 ;;
-        vxworks29k)                                     # CYGNUS LOCAL
-                basic_machine=a29k-wrs
-                os=-vxworks
-                ;;
-        w65*)                                           # CYGNUS LOCAL
-                basic_machine=w65-wdc
-                os=-none
+        vxworks29k)
+                basic_machine=a29k-wrs
+                os=-vxworks
+                ;;
+        w65*)
+                basic_machine=w65-wdc
+                os=-none
+                ;;
+        w89k-*)
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
+        windows32)
+                basic_machine=i386-pc
+                os=-windows32-msvcrt
                 ;;
         xmp)
@@ -718 +933 @@
                 basic_machine=xps100-honeywell
                 ;;
-        z8k-*-coff)                                     # CYGNUS LOCAL
+        z8k-*-coff)
                 basic_machine=z8k-unknown
                 os=-sim
@@ -729 +944 @@
 # 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.
-        w89k)                                           # CYGNUS LOCAL
+        w89k)
                 basic_machine=hppa1.1-winbond
                 ;;
-        op50n)                                          # CYGNUS LOCAL
+        op50n)
                 basic_machine=hppa1.1-oki
                 ;;
-        op60c)                                          # CYGNUS LOCAL
+        op60c)
                 basic_machine=hppa1.1-oki
                 ;;
         mips)
-                basic_machine=mips-mips
+                if [ x$os = x-linux-gnu ]; then
+                        basic_machine=mips-unknown
+                else
+                        basic_machine=mips-mips
+                fi
                 ;;
         romp)
@@ -750 +969 @@
                 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
@@ -756 +979 @@
                 basic_machine=we32k-att
                 ;;
-        sparc)
+        sh3 | sh4 | sh3eb | sh4eb)
+                basic_machine=sh-unknown
+                ;;
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
@@ -768 +994 @@
                 basic_machine=clipper-highlevel
                 ;;
-        mac | mpw | mac-mpw)                            # CYGNUS LOCAL
+        mac | mpw | mac-mpw)
                 basic_machine=m68k-apple
                 ;;
-        pmac | pmac-mpw)                                # CYGNUS LOCAL
+        pmac | pmac-mpw)
                 basic_machine=powerpc-apple
+                ;;
+        c4x*)
+                basic_machine=c4x-none
+                os=-coff
+                ;;
+        *-unknown)
+                # Make sure to match an already-canonicalized machine name.
                 ;;
         *)
@@ -797 +1030 @@
 then
 case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
         -solaris1 | -solaris1.*)
@@ -804 +1039 @@
                 os=-solaris2
                 ;;
-        -unixware* | svr4*)
+        -svr4*)
                 os=-sysv4
                 ;;
+        -unixware*)
+                os=-sysv4.2uw
+                ;;
         -gnu/linux*)
-                os=`echo $os | sed -e 's|gnu/linux|linux|'`
+                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                 ;;
         # First accept the basic system types.
         # The portable systems comes first.
-        # Each alternative must end in a *, to match a version number.
+        # Each alternative MUST END IN A *, to match a version number.
         # -sysv* is not here because it comes later, after sysvr4.
-        -gnu* | -bsd* | -mach* | -lites* | -minix* | -genix* | -ultrix* | -irix* \
-              | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
+        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
               | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-              | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
-              | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-              | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix*  | -lites* \
-              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi \
-              | -eabi* | -ieee*)
-                ;;
-        # CYGNUS LOCAL
-        -go32 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug |  -netware* | -proelf | -os9* \
-              | -macos* | -mpw* | -magic* | -pe* | -win32)
-                ;;
-        -mac*)                                          # CYGNUS LOCAL
+              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+              | -aos* \
+              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+              | -chorusos* | -chorusrdb* \
+              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+              | -os2* | -vos*)
+        # Remember, each alternative MUST END IN *, to match a version number.
+                ;;
+        -qnx*)
+                case $basic_machine in
+                    x86-* | i*86-*)
+                        ;;
+                    *)
+                        os=-nto$os
+                        ;;
+                esac
+                ;;
+        -nto*)
+                os=-nto-qnx
+                ;;
+        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+                ;;
+        -mac*)
                 os=`echo $os | sed -e 's|mac|macos|'`
+                ;;
+        -linux*)
+                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                 ;;
         -sunos5*)
@@ -839 +1100 @@
                 os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
+        -opened*)
+                os=-openedition
+                ;;
+        -wince*)
+                os=-wince
+                ;;
         -osfrose*)
                 os=-osfrose
@@ -854 +1121 @@
                 os=-aos
                 ;;
-        -386bsd)                                        # CYGNUS LOCAL
+        -386bsd)
                 os=-bsd
                 ;;
         -ctix* | -uts*)
                 os=-sysv
+                ;;
+        -ns2 )
+                os=-nextstep2
+                ;;
+        -nsk*)
+                os=-nsk
                 ;;
         # Preserve the version number of sinix5.
@@ -885 +1158 @@
         -sysv*)
                 ;;
-        -ose*)                                          # CYGNUS LOCAL
+        -ose*)
                 os=-ose
                 ;;
-        -es1800*)                                       # CYGNUS LOCAL
+        -es1800*)
                 os=-ose
                 ;;
         -xenix)
                 os=-xenix
+                ;;
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
                 ;;
         -none)
@@ -919 +1195 @@
                 os=-riscix1.2
                 ;;
+        arm*-rebel)
+                os=-linux
+                ;;
+        arm*-semi)
+                os=-aout
+                ;;
+        pdp10-*)
+                os=-tops20
+                ;;
         pdp11-*)
                 os=-none
@@ -937 +1222 @@
                 # os=-sunos4
                 ;;
-        m68*-cisco)                                     # CYGNUS LOCAL
+        m68*-cisco)
                 os=-aout
                 ;;
-        mips*-cisco)                                    # CYGNUS LOCAL
+        mips*-cisco)
+                os=-elf
+                ;;
+        mips*-*)
                 os=-elf
                 ;;
@@ -949 +1237 @@
                 os=-sunos4.1.1
                 ;;
+        *-be)
+                os=-beos
+                ;;
         *-ibm)
                 os=-aix
                 ;;
-        *-wec)                                          # CYGNUS LOCAL
+        *-wec)
                 os=-proelf
                 ;;
-        *-winbond)                                      # CYGNUS LOCAL
+        *-winbond)
                 os=-proelf
                 ;;
-        *-oki)                                          # CYGNUS LOCAL
+        *-oki)
                 os=-proelf
                 ;;
@@ -971 +1262 @@
                 ;;
         *-cbm)
-                os=-amigados
+                os=-amigaos
                 ;;
         *-dg)
@@ -985 +1276 @@
                 os=-luna
                 ;;
+        *-next )
+                os=-nextstep
+                ;;
         *-sequent)
                 os=-ptx
@@ -1018 +1312 @@
                 os=-rtu
                 ;;
-        *-rom68k)                                       # CYGNUS LOCAL
+        f30[01]-fujitsu | f700-fujitsu)
+                os=-uxpv
+                ;;
+        *-rom68k)
                 os=-coff
                 ;;
-        *-*bug)                                         # CYGNUS LOCAL
+        *-*bug)
                 os=-coff
                 ;;
-        *-apple)                                        # CYGNUS LOCAL
+        *-apple)
                 os=-macos
+                ;;
+        *-atari*)
+                os=-mint
                 ;;
         *)
@@ -1045 +1345 @@
                                 vendor=sun
                                 ;;
-                        -bosx*)                         # CYGNUS LOCAL
-                                vendor=bull
-                                ;;
-                        -lynxos*)
-                                vendor=lynx
-                                ;;
                         -aix*)
                                 vendor=ibm
                                 ;;
+                        -beos*)
+                                vendor=be
+                                ;;
                         -hpux*)
                                 vendor=hp
                                 ;;
+                        -mpeix*)
+                                vendor=hp
+                                ;;
                         -hiux*)
                                 vendor=hitachi
@@ -1072 +1372 @@
                                 vendor=ns
                                 ;;
-                        -mvs*)
+                        -mvs* | -opened*)
                                 vendor=ibm
                                 ;;
@@ -1078 +1378 @@
                                 vendor=sequent
                                 ;;
-                        -vxworks*)
+                        -vxsim* | -vxworks*)
                                 vendor=wrs
                                 ;;
-                        -hms*)                          # CYGNUS LOCAL
+                        -aux*)
+                                vendor=apple
+                                ;;
+                        -hms*)
                                 vendor=hitachi
                                 ;;
-                        -mpw* | -macos*)                # CYGNUS LOCAL
+                        -mpw* | -macos*)
                                 vendor=apple
+                                ;;
+                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                                vendor=atari
+                                ;;
+                        -vos*)
+                                vendor=stratus
                                 ;;
                 esac
@@ -1093 +1402 @@
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

MP/pvmgetarch

@@ -53 +53 @@
         FreeBSD,i386 )          ARCH=FREEBSD ;;
         SUPER-UX,SX-3 )         ARCH=SX3 ;;
+        Darwin,*)               ARCH=PPCMAC ;;
         uts,* )                 ARCH=UTS2 ;;
         esac