Merge 4.2p1 to the trunk.

1 files changed, 69 insertions, 36 deletions

diff --git a/config.sub b/config.sub
index 463186dbf..519f2cd00 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, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-01-05'
+timestamp='2005-05-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2004-01-05'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # 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>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@ 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
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - ) # Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -145,7 +146,7 @@ case $os in
         -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)
+        -apple | -axis | -knuth | -cray)
                 os=
                 basic_machine=$1
                 ;;
@@ -231,13 +232,14 @@ case $basic_machine in
         | 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 \
+        | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
         | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m68000 | m68k | m88k | mcore \
+        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
@@ -262,12 +264,13 @@ case $basic_machine in
         | pyramid \
         | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b \
         | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xscale | xstormy16 | xtensa \
+        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
         | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -298,9 +301,9 @@ case $basic_machine in
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* \
-        | bs2000-* \
+        | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | cydra-* \
+        | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
         | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -308,9 +311,9 @@ case $basic_machine in
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
-        | m32r-* \
+        | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | mcore-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
@@ -326,8 +329,9 @@ case $basic_machine in
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
+        | mmix-* \
         | msp430-* \
-        | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -335,15 +339,16 @@ case $basic_machine in
         | romp-* | rs6000-* \
         | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+        | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
         | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-        | xtensa-* \
+        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | xstormy16-* | xtensa-* \
         | ymp-* \
         | z8k-*)
                 ;;
@@ -363,6 +368,9 @@ case $basic_machine in
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
+        abacus)
+                basic_machine=abacus-unknown
+                ;;
         adobe68k)
                 basic_machine=m68010-adobe
                 os=-scout
@@ -442,12 +450,27 @@ case $basic_machine in
                 basic_machine=j90-cray
                 os=-unicos
                 ;;
+        craynv)
+                basic_machine=craynv-cray
+                os=-unicosmp
+                ;;
+        cr16c)
+                basic_machine=cr16c-unknown
+                os=-elf
+                ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
+        crisv32 | crisv32-* | etraxfs*)
+                basic_machine=crisv32-axis
+                ;;
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
                 ;;
+        crx)
+                basic_machine=crx-unknown
+                os=-elf
+                ;;
         da30 | da30-*)
                 basic_machine=m68k-da30
                 ;;
@@ -470,6 +493,10 @@ case $basic_machine in
                 basic_machine=m88k-motorola
                 os=-sysv3
                 ;;
+        djgpp)
+                basic_machine=i586-pc
+                os=-msdosdjgpp
+                ;;
         dpx20 | dpx20-*)
                 basic_machine=rs6000-bull
                 os=-bosx
@@ -648,10 +675,6 @@ case $basic_machine in
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
-        mmix*)
-                basic_machine=mmix-knuth
-                os=-mmixware
-                ;;
         monitor)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -732,10 +755,6 @@ case $basic_machine in
         np1)
                 basic_machine=np1-gould
                 ;;
-        nv1)
-                basic_machine=nv1-cray
-                os=-unicosmp
-                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
                 ;;
@@ -1018,6 +1037,10 @@ case $basic_machine in
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
+        xbox)
+                basic_machine=i686-pc
+                os=-mingw32
+                ;;
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
@@ -1048,6 +1071,9 @@ case $basic_machine in
         romp)
                 basic_machine=romp-ibm
                 ;;
+        mmix)
+                basic_machine=mmix-knuth
+                ;;
         rs6000)
                 basic_machine=rs6000-ibm
                 ;;
@@ -1070,7 +1096,7 @@ case $basic_machine in
         sh64)
                 basic_machine=sh64-unknown
                 ;;
-        sparc | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
         cydra)
@@ -1143,8 +1169,9 @@ case $os in
               | -aos* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -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* \
@@ -1155,7 +1182,7 @@ case $os in
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1282,6 +1309,9 @@ case $os in
         -kaos*)
                 os=-kaos
                 ;;
+        -zvmoe)
+                os=-zvmoe
+                ;;
         -none)
                 ;;
         *)
@@ -1362,6 +1392,9 @@ case $basic_machine in
         *-ibm)
                 os=-aix
                 ;;
+        *-knuth)
+                os=-mmixware
+                ;;
         *-wec)
                 os=-proelf
                 ;;
@@ -1527,7 +1560,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)