1 files changed, 21 insertions, 46 deletions

diff --git a/config.sub b/config.sub
index 2d8169626..c2d125724 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /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, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
-timestamp='2011-01-01'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -124,9 +124,8 @@ 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-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | 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
@@ -283,7 +282,6 @@ case $basic_machine in
         | moxie \
         | mt \
         | msp430 \
-        | nds32 | nds32le | nds32be \
         | nios | nios2 \
         | ns16k | ns32k \
         | or32 \
@@ -297,7 +295,7 @@ case $basic_machine in
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
         | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
         | spu | strongarm \
-        | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | tahoe | thumb | tic4x | tic80 | tron \
         | ubicom32 \
         | v850 | v850e \
         | we32k \
@@ -305,15 +303,6 @@ case $basic_machine in
         | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
-        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
@@ -345,7 +334,7 @@ case $basic_machine in
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* | avr32-* \
         | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
@@ -379,7 +368,6 @@ case $basic_machine in
         | mmix-* \
         | mt-* \
         | msp430-* \
-        | nds32-* | nds32le-* | nds32be-* \
         | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
@@ -494,15 +482,6 @@ case $basic_machine in
                 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
@@ -539,7 +518,7 @@ case $basic_machine in
                 basic_machine=craynv-cray
                 os=-unicosmp
                 ;;
-        cr16 | cr16-*)
+        cr16)
                 basic_machine=cr16-unknown
                 os=-elf
                 ;;
@@ -862,12 +841,6 @@ case $basic_machine in
         np1)
                 basic_machine=np1-gould
                 ;;
-        neo-tandem)
-                basic_machine=neo-tandem
-                ;;
-        nse-tandem)
-                basic_machine=nse-tandem
-                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
                 ;;
@@ -1102,6 +1075,18 @@ case $basic_machine in
                 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
+                ;;
         # This must be matched before tile*.
         tilegx*)
                 basic_machine=tilegx-unknown
@@ -1316,8 +1301,7 @@ case $os in
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* | -cegcc* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-android* \
-              | -linux-newlib* | -linux-uclibc* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
               | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1500,15 +1484,6 @@ case $basic_machine in
         c4x-* | tic4x-*)
                 os=-coff
                 ;;
-        tic54x-*)
-                os=-coff
-                ;;
-        tic55x-*)
-                os=-coff
-                ;;
-        tic6x-*)
-                os=-coff
-                ;;
         # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20