Update to latest versions of config.guess and config.sub from GNU

autoconf/config.sub

 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-08-19'
+timestamp='2011-08-15'
 
 # 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.
 #
 # 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
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
@@ skipping 50 matching lines @@
 Operation modes:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
 
 Report bugs and patches to <config-patches@gnu.org>."
 
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
@@ skipping 26 matching lines @@
     exit 1;;
  1) ;;
  *) echo "$me: too many arguments$help" >&2
     exit 1;;
 esac
 
 # 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* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
     then os=`echo $1 | sed 's/.*-/-/'`
     else os=; fi
@@ skipping 11 matching lines @@
         -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
         -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
         -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
         -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
         -apple | -axis | -knuth | -cray | -microblaze)
                 os=
                 basic_machine=$1
                 ;;
-        -bluegene*)
-                os=-cnk
+        -bluegene*)
+                os=-cnk
                 ;;
         -sim | -cisco | -oki | -wec | -winbond)
                 os=
                 basic_machine=$1
                 ;;
         -scout)
                 ;;
         -wrs)
                 os=-vxworks
                 basic_machine=$1
                 ;;
         -chorusos*)
                 os=-chorusos
                 basic_machine=$1
                 ;;
-        -chorusrdb)
-                os=-chorusrdb
+        -chorusrdb)
+                os=-chorusrdb
                 basic_machine=$1
-                ;;
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
         -sco6)
                 os=-sco5v6
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco5)
                 os=-sco3.2v5
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ skipping 47 matching lines @@
                 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.
         1750a | 580 \
+        | 32e[bl] | 64e[bl] \
         | a29k \
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
         | am33_2.0 \
         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
         | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
         | fido | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
@@ skipping 17 matching lines @@
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
         | mipsisa64r2 | mipsisa64r2el \
         | mipsisa64sb1 | mipsisa64sb1el \
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
         | moxie \
         | mt \
         | msp430 \
+        | nds32 | nds32le | nds32be \
         | nios | nios2 \
         | ns16k | ns32k \
+        | open8 \
         | or32 \
         | pdp10 | pdp11 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
+        | rx \
         | score \
         | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
         | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-        | spu | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
-        | v850 | v850e \
+        | spu \
+        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | ubicom32 \
+        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
         | we32k \
-        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xc16x | xstormy16 | xtensa \
         | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
-        m6811 | m68hc11 | m6812 | m68hc12)
+        c54x)
+                basic_machine=tic54x-unknown
+                ;;
+        c55x)
+                basic_machine=tic55x-unknown
+                ;;
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
                 # Motorola 68HC11/12.
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                 ;;
         ms1)
                 basic_machine=mt-unknown
                 ;;
 
+        strongarm | thumb | xscale)
+                basic_machine=arm-unknown
+                ;;
+
+        xscaleeb)
+                basic_machine=armeb-unknown
+                ;;
+
+        xscaleel)
+                basic_machine=armel-unknown
+                ;;
+
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
         i*86 | x86_64)
           basic_machine=$basic_machine-pc
           ;;
         # Object if more than one company name word.
         *-*-*)
                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                 exit 1
                 ;;
         # Recognize the basic CPU types with company name.
         580-* \
+        | 32e[bl]-* | 64e[bl]-* \
         | a29k-* \
         | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* | avr32-* \
         | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
         | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
         | lm32-* \
         | m32c-* | m32r-* | m32rle-* \
@@ skipping 13 matching lines @@
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
         | mipsisa64r2-* | mipsisa64r2el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
         | mt-* \
         | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
         | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
         | pyramid-* \
-        | romp-* | rs6000-* \
+        | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
         | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-        | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+        | tahoe-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile*-* \
         | tron-* \
-        | v850-* | v850e-* | vax-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* \
         | xstormy16-* | xtensa*-* \
         | ymp-* \
         | z8k-* | z80-*)
                 ;;
         # Recognize the basic CPU types without company name, with glob match.
         xtensa*)
                 basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
         386bsd)
                 basic_machine=i386-unknown
                 os=-bsd
                 ;;
         3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
                 basic_machine=m68000-att
                 ;;
         3b*)
                 basic_machine=we32k-att
                 ;;
         a29khif)
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
-        abacus)
+        abacus)
                 basic_machine=abacus-unknown
                 ;;
         adobe68k)
                 basic_machine=m68010-adobe
                 os=-scout
                 ;;
         alliant | fx80)
                 basic_machine=fx80-alliant
                 ;;
         altos | altos3068)
@@ skipping 49 matching lines @@
                 os=-linux
                 ;;
         blackfin-*)
                 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
                 os=-linux
                 ;;
         bluegene*)
                 basic_machine=powerpc-ibm
                 os=-cnk
                 ;;
+        c54x-*)
+                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c55x-*)
+                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c6x-*)
+                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         c90)
                 basic_machine=c90-cray
                 os=-unicos
                 ;;
-        cegcc)
+        cegcc)
                 basic_machine=arm-unknown
                 os=-cegcc
                 ;;
         convex-c1)
                 basic_machine=c1-convex
                 os=-bsd
                 ;;
         convex-c2)
                 basic_machine=c2-convex
                 os=-bsd
@@ skipping 11 matching lines @@
                 os=-bsd
                 ;;
         cray | j90)
                 basic_machine=j90-cray
                 os=-unicos
                 ;;
         craynv)
                 basic_machine=craynv-cray
                 os=-unicosmp
                 ;;
-        cr16)
+        cr16 | cr16-*)
                 basic_machine=cr16-unknown
                 os=-elf
                 ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
         crisv32 | crisv32-* | etraxfs*)
                 basic_machine=crisv32-axis
                 ;;
         cris | cris-* | etrax*)
@@ skipping 195 matching lines @@
                 basic_machine=m88k-omron
                 ;;
         magnum | m3230)
                 basic_machine=mips-mips
                 os=-sysv
                 ;;
         merlin)
                 basic_machine=ns32k-utek
                 os=-sysv
                 ;;
-        microblaze)
+        microblaze)
                 basic_machine=microblaze-xilinx
                 ;;
         mingw32)
                 basic_machine=i386-pc
                 os=-mingw32
                 ;;
         mingw32ce)
                 basic_machine=arm-unknown
                 os=-mingw32ce
                 ;;
@@ skipping 22 matching lines @@
                 basic_machine=i386-pc
                 os=-msdos
                 ;;
         ms1-*)
                 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         mvs)
                 basic_machine=i370-ibm
                 os=-mvs
                 ;;
+        nacl)
+                basic_machine=32el-unknown
+                os=-nacl
+                ;;
         ncr3000)
                 basic_machine=i486-ncr
                 os=-sysv4
                 ;;
         netbsd386)
                 basic_machine=i386-unknown
                 os=-netbsd
                 ;;
         netwinder)
                 basic_machine=armv4l-rebel
@@ skipping 44 matching lines @@
                 basic_machine=i960-intel
                 os=-mon960
                 ;;
         nonstopux)
                 basic_machine=mips-compaq
                 os=-nonstopux
                 ;;
         np1)
                 basic_machine=np1-gould
                 ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
                 ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
         openrisc | openrisc-*)
                 basic_machine=or32-unknown
                 ;;
@@ skipping 62 matching lines @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pentium4-*)
                 basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
                 basic_machine=pn-gould
                 ;;
         power)  basic_machine=power-ibm
                 ;;
-        ppc)    basic_machine=powerpc-unknown
+        ppc | ppcbe)    basic_machine=powerpc-unknown
                 ;;
-        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ppc-* | ppcbe-*)
+                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/^[^-]*-//'`
@@ skipping 73 matching lines @@
         spur)
                 basic_machine=spur-unknown
                 ;;
         st2000)
                 basic_machine=m68k-tandem
                 ;;
         stratus)
                 basic_machine=i860-stratus
                 os=-sysv4
                 ;;
+        strongarm-* | thumb-*)
+                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         sun2)
                 basic_machine=m68000-sun
                 ;;
         sun2os3)
                 basic_machine=m68000-sun
                 os=-sunos3
                 ;;
         sun2os4)
                 basic_machine=m68000-sun
                 os=-sunos4
@@ skipping 36 matching lines @@
                 os=-dynix
                 ;;
         t3e)
                 basic_machine=alphaev5-cray
                 os=-unicos
                 ;;
         t90)
                 basic_machine=t90-cray
                 os=-unicos
                 ;;
-        tic54x | c54x*)
-                basic_machine=tic54x-unknown
-                os=-coff
-                ;;
-        tic55x | c55x*)
-                basic_machine=tic55x-unknown
-                os=-coff
-                ;;
-        tic6x | c6x*)
-                basic_machine=tic6x-unknown
-                os=-coff
-                ;;
         tile*)
-                basic_machine=tile-unknown
+                basic_machine=$basic_machine-unknown
                 os=-linux-gnu
                 ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
         tx39el)
                 basic_machine=mipstx39el-unknown
                 ;;
         toad1)
                 basic_machine=pdp10-xkl
@@ skipping 49 matching lines @@
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
         xbox)
                 basic_machine=i686-pc
                 os=-mingw32
                 ;;
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
+        xscale-* | xscalee[bl]-*)
+                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+                ;;
         ymp)
                 basic_machine=ymp-cray
                 os=-unicos
                 ;;
         z8k-*-coff)
                 basic_machine=z8k-unknown
                 os=-sim
                 ;;
         z80-*-coff)
                 basic_machine=z80-unknown
@@ skipping 77 matching lines @@
                 ;;
         *)
                 ;;
 esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+                os=-auroraux
+                ;;
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
                 ;;
-        -auroraux)
-                os=-auroraux
-                ;;
         -solaris)
                 os=-solaris2
                 ;;
         -svr4*)
                 os=-sysv4
                 ;;
         -unixware*)
                 os=-sysv4.2uw
                 ;;
         -gnu/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.
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
               | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* | -sym* \
-              | -kopensolaris* \
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
               | -aos* | -aros* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
               | -openbsd* | -solidbsd* \
               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* | -cegcc* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-uclibc* \
               | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
                 case $basic_machine in
                     x86-* | i*86-*)
                         ;;
                     *)
                         os=-nto$os
                         ;;
                 esac
@@ skipping 18 matching lines @@
                 ;;
         -sunos5*)
                 os=`echo $os | sed -e 's|sunos5|solaris2|'`
                 ;;
         -sunos6*)
                 os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
         -opened*)
                 os=-openedition
                 ;;
-        -os400*)
+        -os400*)
                 os=-os400
                 ;;
         -wince*)
                 os=-wince
                 ;;
         -osfrose*)
                 os=-osfrose
                 ;;
         -osf*)
                 os=-osf
@@ skipping 28 matching lines @@
         -nsk*)
                 os=-nsk
                 ;;
         # Preserve the version number of sinix5.
         -sinix5.*)
                 os=`echo $os | sed -e 's|sinix|sysv|'`
                 ;;
         -sinix*)
                 os=-sysv4
                 ;;
-        -tpf*)
+        -tpf*)
                 os=-tpf
                 ;;
         -triton*)
                 os=-sysv3
                 ;;
         -oss*)
                 os=-sysv3
                 ;;
         -svr4)
                 os=-sysv4
@@ skipping 24 matching lines @@
                 ;;
         -kaos*)
                 os=-kaos
                 ;;
         -zvmoe)
                 os=-zvmoe
                 ;;
         -dicos*)
                 os=-dicos
                 ;;
+        -nacl*)
+                ;;
         -none)
                 ;;
         *)
                 # Get rid of the `-' at the beginning of $os.
                 os=`echo $os | sed 's/[^-]*-//'`
                 echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
                 exit 1
                 ;;
 esac
 else
 
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.
 
 # Note that if you're going to try to match "-MANUFACTURER" here (say,
 # "-sun"), then you have to tell the case statement up towards the top
 # that MANUFACTURER isn't an operating system.  Otherwise, code above
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+        score-*)
                 os=-elf
                 ;;
-        spu-*)
+        spu-*)
                 os=-elf
                 ;;
         *-acorn)
                 os=-riscix1.2
                 ;;
         arm*-rebel)
                 os=-linux
                 ;;
         arm*-semi)
                 os=-aout
                 ;;
-        c4x-* | tic4x-*)
-                os=-coff
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
+        tic54x-*)
+                os=-coff
+                ;;
+        tic55x-*)
+                os=-coff
+                ;;
+        tic6x-*)
+                os=-coff
                 ;;
         # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
                 ;;
         pdp11-*)
                 os=-none
                 ;;
         *-dec | vax-*)
                 os=-ultrix4.2
                 ;;
         m68*-apollo)
                 os=-domain
                 ;;
         i386-sun)
                 os=-sunos4.0.2
                 ;;
         m68000-sun)
                 os=-sunos3
                 # This also exists in the configure program, but was not the
                 # default.
                 # os=-sunos4
                 ;;
         m68*-cisco)
                 os=-aout
                 ;;
-        mep-*)
+        mep-*)
                 os=-elf
                 ;;
         mips*-cisco)
                 os=-elf
                 ;;
         mips*-*)
                 os=-elf
                 ;;
         or32-*)
                 os=-coff
                 ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
                 ;;
         sparc-* | *-sun)
                 os=-sunos4.1.1
                 ;;
         *-be)
                 os=-beos
                 ;;
         *-haiku)
                 os=-haiku
                 ;;
         *-ibm)
                 os=-aix
                 ;;
-        *-knuth)
+        *-knuth)
                 os=-mmixware
                 ;;
         *-wec)
                 os=-proelf
                 ;;
         *-winbond)
                 os=-proelf
                 ;;
         *-oki)
                 os=-proelf
@@ skipping 155 matching lines @@
 
 echo $basic_machine$os
 exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End: