Upgrade to current (2002-11-13) version from <ftp://ftp.gnu.org/pub/gnu/config/>.

3 files changed, 159 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 4db4ba56034..c7102f985d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-22  Juanma Barranquero  <lektu@terra.es>
+
+        * config.guess, config.sub: Updated from master source.
+
 2002-11-19  Karl Fogel  <kfogel@red-bean.com>
 
         * autogen.sh: New file.
diff --git a/config.guess b/config.guess
index fbad77f14ba..0149c53609b 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-05-22'
+timestamp='2002-11-13'
 
 # 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 ;
+# 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
-          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-          if test $? = 0 ; then
+          if ($c -c -o $dummy.o $dummy.c) >/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)
@@ -221,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:
@@ -246,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
+        $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
         if test "$?" = 0 ; then
-                case `./$dummy` in
+                case `$dummy` in
                         0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
@@ -271,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*:*)
@@ -314,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 ;;
@@ -420,16 +437,19 @@ EOF
           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
+        $CC_FOR_BUILD -o $dummy $dummy.c \
+          && $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)
+    Motorola:*:4.3:PL8-*)
+        echo powerpc-harris-powermax
+        exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
         echo powerpc-harris-powermax
         exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -504,8 +524,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 -o $dummy $dummy.c && $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
@@ -603,9 +623,9 @@ EOF
                   exit (0);
               }
 EOF
-                    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 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}
@@ -641,8 +661,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 -o $dummy $dummy.c && $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:*:* )
@@ -725,7 +745,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
@@ -739,6 +771,9 @@ EOF
     x86:Interix*:3*)
         echo i386-pc-interix3
         exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+        echo i${UNAME_MACHINE}-pc-mks
+        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
@@ -786,7 +821,7 @@ EOF
         #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:*:*)
@@ -849,7 +884,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 ;;
@@ -882,7 +917,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
         ;;
@@ -921,13 +956,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
@@ -960,6 +995,12 @@ EOF
         # "miniframe"
         echo m68010-convergent-sysv
         exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+        echo m68k-convergent-sysv
+        exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+        echo m68k-diab-dnix
+        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 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
@@ -1053,6 +1094,9 @@ EOF
     SX-5:SUPER-UX:*:*)
         echo sx5-nec-superux${UNAME_RELEASE}
         exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+        echo sx6-nec-superux${UNAME_RELEASE}
+        exit 0 ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
         exit 0 ;;
@@ -1073,7 +1117,7 @@ EOF
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
         exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1245,8 +1289,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 -o $dummy $dummy.c 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 85a5fb21e9f..aeb3bd99950 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-05-22'
+timestamp='2002-11-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,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* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,24 +229,34 @@ case $basic_machine in
         | 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 | dsp16xx \
-        | fr30 \
+        | 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 | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-        | mips64vr4100 | mips64vr4100el | mips64vr4300 \
-        | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-        | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-        | mipsisa32 | mipsisa64 \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64vr | mips64vrel \
+        | mips64orion | mips64orionel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
+        | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
         | ns16k | ns32k \
         | openrisc | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+        | 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 \
@@ -284,31 +294,42 @@ case $basic_machine in
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* \
         | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c54x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
         | clipper-* | cydra-* \
-        | d10v-* | d30v-* \
+        | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | fx80-* \
+        | 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-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-        | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-        | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-        | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64vr-* | mips64vrel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipstx39 | mipstx39el \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+        | 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-* \
+        | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
         | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -728,13 +749,13 @@ case $basic_machine in
         pbb)
                 basic_machine=m68k-tti
                 ;;
-        pc532 | pc532-*)
+        pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
                 ;;
-        pentiumpro | p6 | 6x86 | athlon)
+        pentiumpro | p6 | 6x86 | athlon | athlon_*)
                 basic_machine=i686-pc
                 ;;
         pentiumii | pentium2)
@@ -755,22 +776,22 @@ case $basic_machine in
         power)  basic_machine=power-ibm
                 ;;
         ppc)    basic_machine=powerpc-unknown
-                ;;
+                ;;
         ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-                ;;
+                ;;
         ppcle-* | powerpclittle-*)
                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppc64)  basic_machine=powerpc64-unknown
-                ;;
+                ;;
         ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                 basic_machine=powerpc64le-unknown
-                ;;
+                ;;
         ppc64le-* | powerpc64little-*)
                 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
@@ -801,6 +822,12 @@ case $basic_machine in
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
+        sb1)
+                basic_machine=mipsisa64sb1-unknown
+                ;;
+        sb1el)
+                basic_machine=mipsisa64sb1el-unknown
+                ;;
         sequent)
                 basic_machine=i386-sequent
                 ;;
@@ -866,7 +893,7 @@ case $basic_machine in
         sun386 | sun386i | roadrunner)
                 basic_machine=i386-sun
                 ;;
-        sv1)
+        sv1)
                 basic_machine=sv1-cray
                 os=-unicos
                 ;;
@@ -886,6 +913,10 @@ case $basic_machine in
                 basic_machine=t90-cray
                 os=-unicos
                 ;;
+        tic4x | c4x*)
+                basic_machine=tic4x-unknown
+                os=-coff
+                ;;
         tic54x | c54x*)
                 basic_machine=tic54x-unknown
                 os=-coff
@@ -924,8 +955,8 @@ case $basic_machine in
                 os=-vms
                 ;;
         vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+                basic_machine=f301-fujitsu
+                ;;
         vxworks960)
                 basic_machine=i960-wrs
                 os=-vxworks
@@ -946,11 +977,7 @@ case $basic_machine in
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
-        windows32)
-                basic_machine=i386-pc
-                os=-windows32-msvcrt
-                ;;
-        xps | xps100)
+        xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
         ymp)
@@ -996,7 +1023,7 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh3eb | sh4eb)
+        sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
                 basic_machine=sh-unknown
                 ;;
         sh64)
@@ -1005,7 +1032,7 @@ case $basic_machine in
         sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
-        cydra)
+        cydra)
                 basic_machine=cydra-cydrome
                 ;;
         orion)
@@ -1020,10 +1047,6 @@ case $basic_machine in
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
                 ;;
-        c4x*)
-                basic_machine=c4x-none
-                os=-coff
-                ;;
         *-unknown)
                 # Make sure to match an already-canonicalized machine name.
                 ;;
@@ -1086,11 +1109,12 @@ case $os in
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
               | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+              | -powermax* | -dnix*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1155,7 +1179,7 @@ case $os in
                 os=-rtmk-nova
                 ;;
         -ns2 )
-                os=-nextstep2
+                os=-nextstep2
                 ;;
         -nsk*)
                 os=-nsk
@@ -1194,8 +1218,8 @@ case $os in
         -xenix)
                 os=-xenix
                 ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
                 ;;
         -none)
                 ;;
@@ -1232,7 +1256,7 @@ case $basic_machine in
         pdp10-*)
                 os=-tops20
                 ;;
-        pdp11-*)
+        pdp11-*)
                 os=-none
                 ;;
         *-dec | vax-*)
@@ -1325,19 +1349,19 @@ case $basic_machine in
         *-next)
                 os=-nextstep3
                 ;;
-        *-gould)
+        *-gould)
                 os=-sysv
                 ;;
-        *-highlevel)
+        *-highlevel)
                 os=-bsd
                 ;;
         *-encore)
                 os=-bsd
                 ;;
-        *-sgi)
+        *-sgi)
                 os=-irix
                 ;;
-        *-siemens)
+        *-siemens)
                 os=-sysv4
                 ;;
         *-masscomp)