- (djm) Update config.guess and config.sub to autoconf-2.59 versions; ok tim@

1 files changed, 89 insertions, 46 deletions

diff --git a/config.sub b/config.sub
index 75a74f78e..1f31816b9 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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-07-03'
+timestamp='2003-08-18'
 
 # 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -162,10 +162,10 @@ case $os in
                 os=-chorusos
                 basic_machine=$1
                 ;;
-        -chorusrdb)
-                os=-chorusrdb
+        -chorusrdb)
+                os=-chorusrdb
                 basic_machine=$1
-                ;;
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
@@ -228,36 +228,42 @@ case $basic_machine in
         | 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 \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
         | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
-        | ip2k \
+        | ip2k | iq2000 \
         | m32r | m68000 | m68k | m88k | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
+        | mips64vr | mips64vrel \
         | mips64orion | mips64orionel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
         | mipsisa32 | mipsisa32el \
+        | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
         | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
+        | msp430 \
         | ns16k | ns32k \
         | openrisc | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | 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 \
-        | tahoe | thumb | tic80 | tron \
+        | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
         | x86 | xscale | xstormy16 | xtensa \
@@ -292,7 +298,7 @@ case $basic_machine in
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* \
         | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c54x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
         | clipper-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
@@ -300,32 +306,39 @@ case $basic_machine in
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* \
+        | ip2k-* | iq2000-* \
         | m32r-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
         | m88110-* | m88k-* | mcore-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
+        | mips64vr-* | mips64vrel-* \
         | mips64orion-* | mips64orionel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
         | mipsisa32-* | mipsisa32el-* \
+        | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
-        | mipstx39 | mipstx39el \
-        | none-* | np1-* | ns16k-* | ns32k-* | nv1-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipstx39-* | mipstx39el-* \
+        | msp430-* \
+        | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+        | 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?-* \
-        | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+        | tahoe-* | thumb-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
         | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -363,6 +376,9 @@ case $basic_machine in
                 basic_machine=a29k-none
                 os=-bsd
                 ;;
+        amd64)
+                basic_machine=x86_64-pc
+                ;;
         amdahl)
                 basic_machine=580-amdahl
                 os=-sysv
@@ -712,11 +728,12 @@ case $basic_machine in
         np1)
                 basic_machine=np1-gould
                 ;;
-        nsr-tandem)
-                basic_machine=nsr-tandem
-                ;;
         nv1)
                 basic_machine=nv1-cray
+                os=-unicosmp
+                ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
                 ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
@@ -754,21 +771,27 @@ case $basic_machine in
         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)
+        pentiumii | pentium2 | pentiumiii | pentium3)
                 basic_machine=i686-pc
                 ;;
+        pentium4)
+                basic_machine=i786-pc
+                ;;
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pentiumpro-* | p6-* | 6x86-* | athlon-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-*)
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
+        pentium4-*)
+                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pn)
                 basic_machine=pn-gould
                 ;;
@@ -821,6 +844,16 @@ case $basic_machine in
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
+        sb1)
+                basic_machine=mipsisa64sb1-unknown
+                ;;
+        sb1el)
+                basic_machine=mipsisa64sb1el-unknown
+                ;;
+        sei)
+                basic_machine=mips-sei
+                os=-seiux
+                ;;
         sequent)
                 basic_machine=i386-sequent
                 ;;
@@ -828,6 +861,9 @@ case $basic_machine in
                 basic_machine=sh-hitachi
                 os=-hms
                 ;;
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
         sparclite-wrs | simso-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
@@ -890,18 +926,10 @@ case $basic_machine in
                 basic_machine=sv1-cray
                 os=-unicos
                 ;;
-        sx*-nec)
-                basic_machine=sx6-nec
-                os=-sysv
-                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
-        t3d)
-                basic_machine=alpha-cray
-                os=-unicos
-                ;;
         t3e)
                 basic_machine=alphaev5-cray
                 os=-unicos
@@ -914,6 +942,14 @@ case $basic_machine in
                 basic_machine=tic54x-unknown
                 os=-coff
                 ;;
+        tic55x | c55x*)
+                basic_machine=tic55x-unknown
+                os=-coff
+                ;;
+        tic6x | c6x*)
+                basic_machine=tic6x-unknown
+                os=-coff
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -948,8 +984,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
@@ -970,10 +1006,6 @@ case $basic_machine in
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
-        windows32)
-                basic_machine=i386-pc
-                os=-windows32-msvcrt
-                ;;
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
@@ -1020,7 +1052,7 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
         sh64)
@@ -1044,10 +1076,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.
                 ;;
@@ -1074,8 +1102,8 @@ esac
 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.
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1103,18 +1131,19 @@ case $os in
               | -aos* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
               | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -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* | -nx6 | -nx7 | -sei*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1126,8 +1155,10 @@ case $os in
                         ;;
                 esac
                 ;;
+        -nto-qnx*)
+                ;;
         -nto*)
-                os=-nto-qnx
+                os=`echo $os | sed -e 's|nto|nto-qnx|'`
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
               | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1136,6 +1167,9 @@ case $os in
         -mac*)
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
+        -linux-dietlibc)
+                os=-linux-dietlibc
+                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
                 ;;
@@ -1221,6 +1255,12 @@ case $os in
         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                 os=-mint
                 ;;
+        -aros*)
+                os=-aros
+                ;;
+        -kaos*)
+                os=-kaos
+                ;;
         -none)
                 ;;
         *)
@@ -1252,6 +1292,9 @@ case $basic_machine in
         arm*-semi)
                 os=-aout
                 ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
         # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20