Use the versions of the file from subversions.

2 files changed, 243 insertions, 118 deletions

diff --git a/config.guess b/config.guess
index 6cb567b8ae6..20c971aae9a 100755
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -23,8 +23,7 @@
 # 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.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -68,6 +67,43 @@ 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
+    *: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.
+        # Determine the machine/vendor (is the vendor relevant).
+        case "${UNAME_MACHINE}" in
+            amiga) machine=m68k-cbm ;;
+            arm32) machine=arm-unknown ;;
+            atari*) machine=m68k-atari ;;
+            sun3*) machine=m68k-sun ;;
+            mac68k) machine=m68k-apple ;;
+            macppc) machine=powerpc-apple ;;
+            hp3[0-9][05]) machine=m68k-hp ;;
+            ibmrt|romp-ibm) machine=romp-ibm ;;
+            *) machine=${UNAME_MACHINE}-unknown ;;
+        esac
+        # The Operating System including object format.
+        if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                | grep __ELF__ >/dev/null
+        then
+            # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+            # Return netbsd for either.  FIX?
+            os=netbsd
+        else
+            os=netbsdelf
+        fi
+        # The 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 ;;
     alpha:OSF1:*:*)
         if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -77,41 +113,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
         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,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
+        .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
         $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
-                ./$dummy
-                case "$?" in
-                        7)
+                case `./$dummy` in
+                        0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
-                        15)
+                        1-0)
                                 UNAME_MACHINE="alphaev5"
                                 ;;
-                        14)
+                        1-1)
                                 UNAME_MACHINE="alphaev56"
                                 ;;
-                        10)
+                        1-101)
                                 UNAME_MACHINE="alphapca56"
                                 ;;
-                        16)
+                        2-303)
                                 UNAME_MACHINE="alphaev6"
                                 ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
                 esac
         fi
         rm -f $dummy.s $dummy
@@ -129,9 +175,6 @@ EOF
     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 ;;
@@ -156,12 +199,12 @@ EOF
     wgrisc:OpenBSD:*:*)
         echo mipsel-unknown-openbsd${UNAME_RELEASE}
         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;;
-    arm32:NetBSD:*:*)
-        echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
         exit 0;;
@@ -218,9 +261,6 @@ EOF
     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 ;;
@@ -250,15 +290,9 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${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 ;;
@@ -271,9 +305,6 @@ EOF
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
         exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
         exit 0 ;;
@@ -289,6 +320,7 @@ EOF
     mips:*:*:UMIPS | mips:*:*:RISCos)
         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[]; {
@@ -328,15 +360,18 @@ EOF
     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
+            else
                 echo m88k-dg-dguxbcs${UNAME_RELEASE}
+            fi
+        else
+            echo i586-dg-dgux${UNAME_RELEASE}
         fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
         exit 0 ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
@@ -402,7 +437,7 @@ EOF
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
         exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    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:*:*)
@@ -453,7 +488,7 @@ EOF
                   exit (0);
               }
 EOF
-        ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
         rm -f $dummy.c $dummy
         esac
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -547,10 +582,13 @@ EOF
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
         exit 0 ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos${UNAME_RELEASE}
+        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY*T3E:*:*:*)
-        echo t3e-cray-unicosmk${UNAME_RELEASE}
+        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*SV1:*:*:*)
+        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'    
         exit 0 ;;
     CRAY-2:*:*:*)
         echo cray2-cray-unicos
@@ -563,9 +601,6 @@ EOF
     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 ;;
@@ -587,9 +622,6 @@ EOF
         fi
         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 ;;
     *:OpenBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
         exit 0 ;;
@@ -618,12 +650,6 @@ EOF
         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
-          armv*)                      UNAME_MACHINE=$UNAME_MACHINE ;;
-          arm* | sa110*)              UNAME_MACHINE="arm" ;;
-        esac
 
         # The BFD linker knows what the default object file format is, so
         # first see if it will tell us. cd to the root directory to prevent
@@ -636,12 +662,39 @@ EOF
                                     s/ .*//
                                     p'`
         case "$ld_supported_emulations" in
-          i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-          i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-          sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-          elf32ppc)
+          *ia64)
+                echo "${UNAME_MACHINE}-unknown-linux"
+                exit 0
+                ;;
+          i?86linux)
+                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+                exit 0
+                ;;
+          i?86coff)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                exit 0
+                ;;
+          sparclinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          armlinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32arm*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+                exit 0
+                ;;
+          armelf_linux*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+          m68klinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32ppc | elf32ppclinux)
                 # Determine Lib Version
                 cat >$dummy.c <<EOF
 #include <features.h>
@@ -670,47 +723,59 @@ EOF
                         fi
                 fi      
                 rm -f $dummy.c $dummy
-                echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+                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
+                cat <<EOF >$dummy.s
+                        .data
+                \$Lformat:
+                        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+                        .text
+                        .globl main
+                        .align 4
+                        .ent main
+                main:
+                        .frame \$30,16,\$26,0
+                        ldgp \$29,0(\$27)
+                        .prologue 1
+                        .long 0x47e03d80 # implver \$0
+                        lda \$2,-1
+                        .long 0x47e20c21 # amask \$2,\$1
+                        lda \$16,\$Lformat
+                        mov \$0,\$17
+                        not \$1,\$18
+                        jsr \$26,printf
+                        ldgp \$29,0(\$26)
+                        mov 0,\$16
+                        jsr \$26,exit
+                        .end main
 EOF
                 LIBC=""
                 $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
                 if test "$?" = 0 ; then
-                        ./$dummy
-                        case "$?" in
-                        7)
+                        case `./$dummy` in
+                        0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
-                        15)
+                        1-0)
                                 UNAME_MACHINE="alphaev5"
                                 ;;
-                        14)
+                        1-1)
                                 UNAME_MACHINE="alphaev56"
                                 ;;
-                        10)
+                        1-101)
                                 UNAME_MACHINE="alphapca56"
                                 ;;
-                        16)
+                        2-303)
                                 UNAME_MACHINE="alphaev6"
                                 ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
                         esac
 
                         objdump --private-headers $dummy | \
@@ -724,6 +789,7 @@ EOF
         elif test "${UNAME_MACHINE}" = "mips" ; then
           cat >$dummy.c <<EOF
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
         int main (int argc, char *argv[]) {
 #else
         int main (argc, argv) int argc; char *argv[]; {
@@ -739,6 +805,8 @@ EOF
 EOF
           $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
           rm -f $dummy.c $dummy
+        elif test "${UNAME_MACHINE}" = "s390"; then
+          echo s390-ibm-linux && exit 0
         else
           # Either a pre-BFD a.out linker (linux-gnuoldld)
           # or one that does not give us useful --help.
@@ -760,6 +828,7 @@ EOF
           cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
         int main (int argc, char *argv[]) {
 #else
         int main (argc, argv) int argc; char *argv[]; {
@@ -797,19 +866,21 @@ EOF
         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_RELEASE}
+                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
         else
-                echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         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.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-        (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+        else
+            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+        fi
         exit 0 ;;
     i?86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -829,7 +900,11 @@ EOF
                 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
@@ -943,6 +1018,15 @@ EOF
     *:Rhapsody:*:*)
         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
         exit 0 ;;
+    Power*:Mac*OS:*:*)
+        echo powerpc-apple-macos${UNAME_RELEASE}
+        exit 0 ;;
+    *:Mac*OS:*:*)
+        echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
+        exit 0 ;;
+    *:QNX:*:4*)
+        echo i386-qnx-qnx${UNAME_VERSION}
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index 2436b45347a..00b90f8841c 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+#
 # 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.
@@ -25,6 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
 # 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.
@@ -105,7 +110,7 @@ case $os in
         -scout)
                 ;;
         -wrs)
-                os=vxworks
+                os=-vxworks
                 basic_machine=$1
                 ;;
         -hiux*)
@@ -156,27 +161,32 @@ case $os in
         -psos*)
                 os=-psos
                 ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
         # 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 \
+        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
                 | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
                 | 580 | i960 | h8300 \
                 | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-                | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+                | alphaev6[78] \
                 | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
                 | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
                 | mips64orion | mips64orionel | mipstx39 | mipstx39el \
                 | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-                | mips64vr5000 | miprs64vr5000el \
+                | mips64vr5000 | miprs64vr5000el | mcore \
                 | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-                | thumb | d10v)
+                | thumb | d10v | fr30 | avr)
                 basic_machine=$basic_machine-unknown
                 ;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
                 ;;
 
         # We use `pc' rather than `unknown'
@@ -191,23 +201,25 @@ case $basic_machine in
                 exit 1
                 ;;
         # Recognize the basic CPU types with company name.
-        vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+        # FIXME: clean up the formatting here.
+        vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
               | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
               | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
               | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
               | xmp-* | ymp-* \
               | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-              | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+              | alphaev6[78]-* \
               | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
               | clipper-* | orion-* \
               | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
               | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
               | mips64el-* | mips64orion-* | mips64orionel-* \
               | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-              | mipstx39-* | mipstx39el-* \
-              | f301-* | armv*-* | t3e-* \
+              | mipstx39-* | mipstx39el-* | mcore-* \
+              | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
               | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-              | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+              | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -425,7 +437,6 @@ case $basic_machine in
                 ;;
         i370-ibm* | ibm*)
                 basic_machine=i370-ibm
-                os=-mvs
                 ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
         i[34567]86v32)
@@ -460,6 +471,9 @@ case $basic_machine in
                 basic_machine=i386-unknown
                 os=-mingw32
                 ;;
+        i386-qnx | qnx)
+                basic_machine=i386-qnx
+                ;;
         iris | iris4d)
                 basic_machine=mips-sgi
                 case $os in
@@ -488,7 +502,7 @@ case $basic_machine in
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
-        *mint | *MiNT)
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
                 basic_machine=m68k-atari
                 os=-mint
                 ;;
@@ -506,6 +520,10 @@ case $basic_machine in
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
+                ;;
         monitor)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -514,6 +532,10 @@ case $basic_machine in
                 basic_machine=i386-unknown
                 os=-msdos
                 ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
         ncr3000)
                 basic_machine=i486-ncr
                 os=-sysv4
@@ -523,7 +545,7 @@ case $basic_machine in
                 os=-netbsd
                 ;;
         netwinder)
-                basic_machine=armv4l-corel
+                basic_machine=armv4l-rebel
                 os=-linux
                 ;;
         news | news700 | news800 | news900)
@@ -718,6 +740,10 @@ case $basic_machine in
         sun386 | sun386i | roadrunner)
                 basic_machine=i386-sun
                 ;;
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
+                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
@@ -907,12 +933,12 @@ case $os in
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
               | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-              | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+              | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
               | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-              | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
         -mac*)
                 os=`echo $os | sed -e 's|mac|macos|'`
@@ -926,6 +952,12 @@ case $os in
         -sunos6*)
                 os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
+        -opened*)
+                os=-openedition
+                ;;
+        -wince*)
+                os=-wince
+                ;;
         -osfrose*)
                 os=-osfrose
                 ;;
@@ -963,6 +995,9 @@ case $os in
         -oss*)
                 os=-sysv3
                 ;;
+        -qnx)
+                os=-qnx4
+                ;;
         -svr4)
                 os=-sysv4
                 ;;
@@ -987,6 +1022,9 @@ case $os in
         -*mint | -*MiNT)
                 os=-mint
                 ;;
+        -neutrino* | -nto*)
+                os=-neutrino
+                ;;
         -none)
                 ;;
         *)
@@ -1012,7 +1050,7 @@ case $basic_machine in
         *-acorn)
                 os=-riscix1.2
                 ;;
-        arm*-corel)
+        arm*-rebel)
                 os=-linux
                 ;;
         arm*-semi)
@@ -1186,7 +1224,7 @@ case $basic_machine in
                         -genix*)
                                 vendor=ns
                                 ;;
-                        -mvs*)
+                        -mvs* | -opened*)
                                 vendor=ibm
                                 ;;
                         -ptx*)
@@ -1207,6 +1245,9 @@ case $basic_machine in
                         -*mint | -*MiNT)
                                 vendor=atari
                                 ;;
+                        -neutrino* | -nto*)
+                                vendor=qnx
+                                ;;
                 esac
                 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                 ;;