- (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/

3 files changed, 271 insertions, 145 deletions

diff --git a/ChangeLog b/ChangeLog
index 96a24da52..f787ee406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20020725
  - (djm) Remove some cruft from INSTALL
+ - (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/
 
 20020723
  - (bal) [bsd-cray.c bsd-cray.h] Part 2 of Cray merger. 
@@ -1455,4 +1456,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2404 2002/07/25 04:36:24 djm Exp $
+$Id: ChangeLog,v 1.2405 2002/07/25 04:40:22 djm Exp $
diff --git a/config.guess b/config.guess
index 83c544d97..fd30ab031 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-01-30'
+timestamp='2002-07-23'
 
 # 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
@@ -88,30 +88,40 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-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. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# 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 ; do
-          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-          if test $? = 0 ; then
+# This shell variable is my proudest work .. or something. --bje
+
+set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
+(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
+   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
+dummy=$tmpdir/dummy ;
+files="$dummy.c $dummy.o $dummy.rel $dummy" ;
+trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+        for c in cc gcc c89 c99 ; do
+          if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
              CC_FOR_BUILD="$c"; break ;
           fi ;
         done ;
-        rm -f $dummy.c $dummy.o $dummy.rel ;
+        rm -f $files ;
         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'
+esac ;
+unset files'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,9 +148,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         #
         # Note: NetBSD doesn't particularly care about the vendor
         # portion of the name.  We always set it to "unknown".
-        UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
-            UNAME_MACHINE_ARCH=unknown
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
         case "${UNAME_MACHINE_ARCH}" in
+            armeb) machine=armeb-unknown ;;
             arm*) machine=arm-unknown ;;
             sh3el) machine=shl-unknown ;;
             sh3eb) machine=sh-unknown ;;
@@ -219,6 +231,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # 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.
+        eval $set_cc_for_build
         cat <<EOF >$dummy.s
         .data
 \$Lformat:
@@ -244,10 +257,9 @@ main:
         jsr \$26,exit
         .end main
 EOF
-        eval $set_cc_for_build
         $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
-                case `./$dummy` in
+                case `$dummy` in
                         0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
@@ -269,9 +281,12 @@ EOF
                         2-1307)
                                 UNAME_MACHINE="alphaev68"
                                 ;;
+                        3-1307)
+                                UNAME_MACHINE="alphaev7"
+                                ;;
                 esac
         fi
-        rm -f $dummy.s $dummy
+        rm -f $dummy.s $dummy && rmdir $tmpdir
         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -312,6 +327,10 @@ EOF
     NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
         exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+        case `/usr/bin/uname -p` in
+            sparc) echo sparc-icl-nx7 && exit 0 ;;
+        esac ;;
     sun4H:SunOS:5.*:*)
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit 0 ;;
@@ -340,7 +359,7 @@ EOF
         echo m68k-sun-sunos${UNAME_RELEASE}
         exit 0 ;;
     sun*:*:4.2BSD:*)
-        UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
         case "`/bin/arch`" in
             sun3)
@@ -419,14 +438,17 @@ EOF
         }
 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
+          && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+        rm -f $dummy.c $dummy && rmdir $tmpdir
         echo mips-mips-riscos${UNAME_RELEASE}
         exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
         echo powerpc-motorola-powermax
         exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS)
+        echo powerpc-harris-powermax
+        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
         exit 0 ;;
@@ -499,8 +521,8 @@ EOF
                         exit(0);
                         }
 EOF
-                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-                rm -f $dummy.c $dummy
+                $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+                rm -f $dummy.c $dummy && rmdir $tmpdir
                 echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -509,7 +531,7 @@ EOF
         fi
         exit 0 ;;
     *:AIX:*:[45])
-        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+        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
@@ -598,9 +620,9 @@ EOF
                   exit (0);
               }
 EOF
-                    (CCOPTS= $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`
                     if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-                    rm -f $dummy.c $dummy
+                    rm -f $dummy.c $dummy && rmdir $tmpdir
                 fi ;;
         esac
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -636,8 +658,8 @@ EOF
           exit (0);
         }
 EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-        rm -f $dummy.c $dummy
+        $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+        rm -f $dummy.c $dummy && rmdir $tmpdir
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -683,9 +705,6 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-        echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
@@ -707,9 +726,6 @@ EOF
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
-    CRAY-2:*:*:*)
-        echo cray2-cray-unicos
-        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/\///'`
@@ -726,7 +742,19 @@ EOF
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        # Determine whether the default compiler uses glibc.
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #if __GLIBC__ >= 2
+        LIBC=gnu
+        #else
+        LIBC=
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        rm -f $dummy.c && rmdir $tmpdir
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
         exit 0 ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
@@ -765,7 +793,7 @@ EOF
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
     ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
     m68*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -776,18 +804,18 @@ EOF
         #undef CPU
         #undef mips
         #undef mipsel
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-        CPU=mipsel 
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+        CPU=mipsel
         #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
         CPU=mips
         #else
         CPU=
         #endif
-        #endif 
+        #endif
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        rm -f $dummy.c
+        rm -f $dummy.c && rmdir $tmpdir
         test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
         ;;
     ppc:Linux:*:*)
@@ -837,9 +865,8 @@ EOF
         # The BFD linker knows what the default object file format is, so
         # first see if it will tell us. cd to the root directory to prevent
         # problems with other programs or directories called `ld' in the path.
-        # Export LANG=C to prevent ld from outputting information in other
-        # languages.
-        ld_supported_targets=`LANG=C; export LANG; cd /; ld --help 2>&1 \
+        # 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: *//
@@ -851,7 +878,7 @@ EOF
                 ;;
           a.out-i386-linux)
                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0 ;;               
+                exit 0 ;;
           coff-i386)
                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                 exit 0 ;;
@@ -884,7 +911,7 @@ EOF
         #endif
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-        rm -f $dummy.c
+        rm -f $dummy.c && rmdir $tmpdir
         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
         test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
         ;;
@@ -923,13 +950,13 @@ EOF
                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
         elif /bin/uname -X 2>/dev/null >/dev/null ; then
-                UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-                (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-                (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                         && UNAME_MACHINE=i586
-                (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                         && UNAME_MACHINE=i686
-                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                         && UNAME_MACHINE=i686
                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
         else
@@ -964,7 +991,7 @@ EOF
         exit 0 ;;
     M68*:*:R3V[567]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*: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`
@@ -1065,12 +1092,12 @@ EOF
         echo `uname -p`-apple-darwin${UNAME_RELEASE}
         exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-        if test "${UNAME_MACHINE}" = "x86pc"; then
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+                UNAME_PROCESSOR=i386
                 UNAME_MACHINE=pc
-                echo i386-${UNAME_MACHINE}-nto-qnx
-        else
-                echo `uname -p`-${UNAME_MACHINE}-nto-qnx
         fi
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
         exit 0 ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
@@ -1247,8 +1274,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $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 && rmdir $tmpdir && exit 0
+rm -f $dummy.c $dummy && rmdir $tmpdir
 
 # Apollos put the system type in the environment.
 
diff --git a/config.sub b/config.sub
index a06a480ad..9ff085efa 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2002-07-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-04-20'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # 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*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +158,14 @@ case $os in
                 os=-vxworks
                 basic_machine=$1
                 ;;
+        -chorusos*)
+                os=-chorusos
+                basic_machine=$1
+                ;;
+        -chorusrdb)
+                os=-chorusrdb
+                basic_machine=$1
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
@@ -215,26 +224,44 @@ esac
 case $basic_machine in
         # Recognize the basic CPU types without company name.
         # Some are omitted here because they have special meanings below.
-        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-                | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-                | pyramid | mn10200 | mn10300 | tron | a29k \
-                | 580 | i960 | h8300 \
-                | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-                | hppa64 \
-                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-                | alphaev6[78] \
-                | we32k | ns16k | clipper | i370 | sh | sh[34] \
-                | powerpc | powerpcle \
-                | 1750a | dsp16xx | pdp10 | pdp11 \
-                | mips16 | mips64 | mipsel | mips64el \
-                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
-                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
-                | v850 | c4x \
-                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-                | pj | pjl | h8500)
+        1750a | 580 \
+        | a29k \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | c4x | clipper \
+        | d10v | d30v | dlx | dsp16xx \
+        | fr30 | frv \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k \
+        | m32r | m68000 | m68k | m88k | mcore \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64orion | mips64orionel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipstx39 | mipstx39el \
+        | mn10200 | mn10300 \
+        | ns16k | ns32k \
+        | openrisc | or32 \
+        | pdp10 | pdp11 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | pyramid \
+        | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | sh64 | sh64le \
+        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+        | strongarm \
+        | tahoe | thumb | tic80 | tron \
+        | v850 | v850e \
+        | we32k \
+        | x86 | xscale | xstormy16 | xtensa \
+        | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
         m6811 | m68hc11 | m6812 | m68hc12)
@@ -242,7 +269,7 @@ case $basic_machine in
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                 ;;
 
         # We use `pc' rather than `unknown'
@@ -257,31 +284,54 @@ case $basic_machine in
                 exit 1
                 ;;
         # Recognize the basic CPU types with company name.
-        # FIXME: clean up the formatting here.
-        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-              | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-              | xmp-* | ymp-* \
-              | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-              | hppa2.0n-* | hppa64-* \
-              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-              | alphaev6[78]-* \
-              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-              | clipper-* | orion-* \
-              | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-              | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
-              | mips16-* | mips64-* | mipsel-* \
-              | mips64el-* | mips64orion-* | mips64orionel-* \
-              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-              | mipstx39-* | mipstx39el-* | mcore-* \
-              | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-              | [cjt]90-* \
-              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+        580-* \
+        | a29k-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* \
+        | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c54x-* \
+        | clipper-* | cydra-* \
+        | d10v-* | d30v-* | dlx-* \
+        | elxsi-* \
+        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* \
+        | m32r-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+        | m88110-* | m88k-* | mcore-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipstx39 | mipstx39el \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | pyramid-* \
+        | romp-* | rs6000-* \
+        | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+        | v850-* | v850e-* | vax-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+        | xtensa-* \
+        | ymp-* \
+        | z8k-*)
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -344,6 +394,10 @@ case $basic_machine in
                 basic_machine=ns32k-sequent
                 os=-dynix
                 ;;
+        c90)
+                basic_machine=c90-cray
+                os=-unicos
+                ;;
         convex-c1)
                 basic_machine=c1-convex
                 os=-bsd
@@ -364,16 +418,8 @@ case $basic_machine in
                 basic_machine=c38-convex
                 os=-bsd
                 ;;
-        cray | ymp)
-                basic_machine=ymp-cray
-                os=-unicos
-                ;;
-        cray2)
-                basic_machine=cray2-cray
-                os=-unicos
-                ;;
-        [cjt]90)
-                basic_machine=${basic_machine}-cray
+        cray | j90)
+                basic_machine=j90-cray
                 os=-unicos
                 ;;
         crds | unos)
@@ -388,6 +434,14 @@ case $basic_machine in
         decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                 basic_machine=mips-dec
                 ;;
+        decsystem10* | dec10*)
+                basic_machine=pdp10-dec
+                os=-tops10
+                ;;
+        decsystem20* | dec20*)
+                basic_machine=pdp10-dec
+                os=-tops20
+                ;;
         delta | 3300 | motorola-3300 | motorola-delta \
               | 3300-motorola | delta-motorola)
                 basic_machine=m68k-motorola
@@ -568,14 +622,6 @@ case $basic_machine in
                 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/'`
                 ;;
@@ -590,6 +636,10 @@ case $basic_machine in
                 basic_machine=m68k-rom68k
                 os=-coff
                 ;;
+        morphos)
+                basic_machine=powerpc-unknown
+                os=-morphos
+                ;;
         msdos)
                 basic_machine=i386-pc
                 os=-msdos
@@ -669,6 +719,10 @@ case $basic_machine in
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
+        or32 | or32-*)
+                basic_machine=or32-unknown
+                os=-coff
+                ;;
         OSE68000 | ose68000)
                 basic_machine=m68000-ericsson
                 os=-ose
@@ -694,7 +748,7 @@ case $basic_machine in
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5 | k5 | k6 | nexgen)
+        pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
                 ;;
         pentiumpro | p6 | 6x86 | athlon)
@@ -703,7 +757,7 @@ case $basic_machine in
         pentiumii | pentium2)
                 basic_machine=i686-pc
                 ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -727,6 +781,16 @@ case $basic_machine in
         ppcle-* | powerpclittle-*)
                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
+        ppc64)  basic_machine=powerpc64-unknown
+                ;;
+        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+                basic_machine=powerpc64le-unknown
+                ;;
+        ppc64le-* | powerpc64little-*)
+                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         ps2)
                 basic_machine=i386-ibm
                 ;;
@@ -744,6 +808,12 @@ case $basic_machine in
         rtpc | rtpc-*)
                 basic_machine=romp-ibm
                 ;;
+        s390 | s390-*)
+                basic_machine=s390-ibm
+                ;;
+        s390x | s390x-*)
+                basic_machine=s390x-ibm
+                ;;
         sa29200)
                 basic_machine=a29k-amd
                 os=-udi
@@ -755,7 +825,7 @@ case $basic_machine in
                 basic_machine=sh-hitachi
                 os=-hms
                 ;;
-        sparclite-wrs)
+        sparclite-wrs | simso-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
                 ;;
@@ -813,7 +883,7 @@ case $basic_machine in
         sun386 | sun386i | roadrunner)
                 basic_machine=i386-sun
                 ;;
-        sv1)
+        sv1)
                 basic_machine=sv1-cray
                 os=-unicos
                 ;;
@@ -821,8 +891,16 @@ case $basic_machine in
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
+        t3d)
+                basic_machine=alpha-cray
+                os=-unicos
+                ;;
         t3e)
-                basic_machine=t3e-cray
+                basic_machine=alphaev5-cray
+                os=-unicos
+                ;;
+        t90)
+                basic_machine=t90-cray
                 os=-unicos
                 ;;
         tic54x | c54x*)
@@ -835,6 +913,10 @@ case $basic_machine in
         tx39el)
                 basic_machine=mipstx39el-unknown
                 ;;
+        toad1)
+                basic_machine=pdp10-xkl
+                os=-tops20
+                ;;
         tower | tower-32)
                 basic_machine=m68k-ncr
                 ;;
@@ -881,13 +963,17 @@ case $basic_machine in
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
-        xmp)
-                basic_machine=xmp-cray
-                os=-unicos
+        windows32)
+                basic_machine=i386-pc
+                os=-windows32-msvcrt
                 ;;
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
+        ymp)
+                basic_machine=ymp-cray
+                os=-unicos
+                ;;
         z8k-*-coff)
                 basic_machine=z8k-unknown
                 os=-sim
@@ -908,13 +994,6 @@ case $basic_machine in
         op60c)
                 basic_machine=hppa1.1-oki
                 ;;
-        mips)
-                if [ x$os = x-linux-gnu ]; then
-                        basic_machine=mips-unknown
-                else
-                        basic_machine=mips-mips
-                fi
-                ;;
         romp)
                 basic_machine=romp-ibm
                 ;;
@@ -934,9 +1013,12 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4)
+        sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
                 basic_machine=sh-unknown
                 ;;
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
         sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
@@ -1018,11 +1100,14 @@ case $os in
               | -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*)
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1074,12 +1159,18 @@ case $os in
         -acis*)
                 os=-aos
                 ;;
+        -atheos*)
+                os=-atheos
+                ;;
         -386bsd)
                 os=-bsd
                 ;;
         -ctix* | -uts*)
                 os=-sysv
                 ;;
+        -nova*)
+                os=-rtmk-nova
+                ;;
         -ns2 )
                 os=-nextstep2
                 ;;
@@ -1154,6 +1245,7 @@ case $basic_machine in
         arm*-semi)
                 os=-aout
                 ;;
+        # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
                 ;;
@@ -1184,6 +1276,9 @@ case $basic_machine in
         mips*-*)
                 os=-elf
                 ;;
+        or32-*)
+                os=-coff
+                ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
                 ;;
@@ -1331,7 +1426,7 @@ case $basic_machine in
                         -ptx*)
                                 vendor=sequent
                                 ;;
-                        -vxsim* | -vxworks*)
+                        -vxsim* | -vxworks* | -windiss*)
                                 vendor=wrs
                                 ;;
                         -aux*)
@@ -1346,6 +1441,9 @@ case $basic_machine in
                         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                 vendor=atari
                                 ;;
+                        -vos*)
+                                vendor=stratus
+                                ;;
                 esac
                 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                 ;;