1 files changed, 147 insertions, 44 deletions

diff --git a/config.sub b/config.sub
index 519f2cd00..a649350a6 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-05-12'
+timestamp='2008-06-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@ 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
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -119,8 +120,9 @@ 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@ case $os in
         -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/'`
@@ -187,6 +193,10 @@ case $os in
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
+        -sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco*)
                 os=-sco3.2v2
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,23 +241,27 @@ case $basic_machine in
         | 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 \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
         | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | fr30 | frv \
+        | fido | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
-        | mips64vr | mips64vrel \
+        | mips64octeon | mips64octeonel \
         | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
         | mipsisa32 | mipsisa32el \
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
@@ -256,21 +270,24 @@ case $basic_machine in
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
+        | mt \
         | msp430 \
+        | nios | nios2 \
         | ns16k | ns32k \
-        | openrisc | or32 \
+        | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
         | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -281,6 +298,9 @@ case $basic_machine in
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                 ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
 
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
@@ -300,28 +320,31 @@ case $basic_machine in
         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
+        | avr-* | avr32-* \
         | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+        | 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-* \
-        | m32r-* | m32rle-* \
+        | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
-        | mips64vr-* | mips64vrel-* \
+        | mips64octeon-* | mips64octeonel-* \
         | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
@@ -330,28 +353,34 @@ case $basic_machine in
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
+        | mt-* \
         | msp430-* \
+        | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
         | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | xstormy16-* | xtensa*-* \
         | ymp-* \
         | z8k-*)
                 ;;
+        # 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)
@@ -422,10 +451,22 @@ case $basic_machine in
                 basic_machine=ns32k-sequent
                 os=-dynix
                 ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         c90)
                 basic_machine=c90-cray
                 os=-unicos
                 ;;
+        cegcc)
+                basic_machine=arm-unknown
+                os=-cegcc
+                ;;
         convex-c1)
                 basic_machine=c1-convex
                 os=-bsd
@@ -454,8 +495,8 @@ case $basic_machine in
                 basic_machine=craynv-cray
                 os=-unicosmp
                 ;;
-        cr16c)
-                basic_machine=cr16c-unknown
+        cr16)
+                basic_machine=cr16-unknown
                 os=-elf
                 ;;
         crds | unos)
@@ -493,6 +534,10 @@ case $basic_machine in
                 basic_machine=m88k-motorola
                 os=-sysv3
                 ;;
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
+                ;;
         djgpp)
                 basic_machine=i586-pc
                 os=-msdosdjgpp
@@ -647,6 +692,14 @@ case $basic_machine in
                 basic_machine=m68k-isi
                 os=-sysv
                 ;;
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         m88k-omron*)
                 basic_machine=m88k-omron
                 ;;
@@ -662,6 +715,10 @@ case $basic_machine in
                 basic_machine=i386-pc
                 os=-mingw32
                 ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
@@ -687,6 +744,9 @@ case $basic_machine in
                 basic_machine=i386-pc
                 os=-msdos
                 ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
         mvs)
                 basic_machine=i370-ibm
                 os=-mvs
@@ -762,9 +822,8 @@ case $basic_machine in
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
-        or32 | or32-*)
+        openrisc | openrisc-*)
                 basic_machine=or32-unknown
-                os=-coff
                 ;;
         os400)
                 basic_machine=powerpc-ibm
@@ -786,6 +845,14 @@ case $basic_machine in
                 basic_machine=i860-intel
                 os=-osf
                 ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         pbd)
                 basic_machine=sparc-tti
                 ;;
@@ -795,6 +862,12 @@ case $basic_machine in
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
                 ;;
@@ -851,6 +924,10 @@ case $basic_machine in
                 basic_machine=i586-unknown
                 os=-pw32
                 ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
         rom68k)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -877,6 +954,10 @@ case $basic_machine in
         sb1el)
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
+                ;;
         sei)
                 basic_machine=mips-sei
                 os=-seiux
@@ -888,6 +969,9 @@ case $basic_machine in
                 basic_machine=sh-hitachi
                 os=-hms
                 ;;
+        sh5el)
+                basic_machine=sh5le-unknown
+                ;;
         sh64)
                 basic_machine=sh64-unknown
                 ;;
@@ -977,6 +1061,10 @@ case $basic_machine in
                 basic_machine=tic6x-unknown
                 os=-coff
                 ;;
+        tile*)
+                basic_machine=tile-unknown
+                os=-linux-gnu
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -1090,13 +1178,10 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
         cydra)
@@ -1169,20 +1254,23 @@ case $os in
               | -aos* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -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* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -linux-gnu* | -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*)
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1200,7 +1288,7 @@ case $os in
                 os=`echo $os | sed -e 's|nto|nto-qnx|'`
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
         -mac*)
@@ -1312,6 +1400,9 @@ case $os in
         -zvmoe)
                 os=-zvmoe
                 ;;
+        -dicos*)
+                os=-dicos
+                ;;
         -none)
                 ;;
         *)
@@ -1334,6 +1425,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
                 ;;
@@ -1343,9 +1440,9 @@ case $basic_machine in
         arm*-semi)
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
         # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
@@ -1371,6 +1468,9 @@ case $basic_machine in
         m68*-cisco)
                 os=-aout
                 ;;
+        mep-*)
+                os=-elf
+                ;;
         mips*-cisco)
                 os=-elf
                 ;;
@@ -1389,6 +1489,9 @@ case $basic_machine in
         *-be)
                 os=-beos
                 ;;
+        *-haiku)
+                os=-haiku
+                ;;
         *-ibm)
                 os=-aix
                 ;;