Merge recent additions from autoconf source tree.

(synchronise with EGCS source tree, as well).

1 files changed, 254 insertions, 32 deletions

diff --git a/config.sub b/config.sub
index 692de9b61de..2436b45347a 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # 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.
@@ -98,11 +98,21 @@ case $os in
                 os=
                 basic_machine=$1
                 ;;
+        -sim | -cisco | -oki | -wec | -winbond)
+                os=
+                basic_machine=$1
+                ;;
+        -scout)
+                ;;
+        -wrs)
+                os=vxworks
+                basic_machine=$1
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
         -sco5)
-                os=sco3.2v5
+                os=-sco3.2v5
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco4)
@@ -121,6 +131,9 @@ case $os in
                 os=-sco3.2v2
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
+        -udk*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -isc)
                 os=-isc2.2
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -152,14 +165,20 @@ case $basic_machine in
         tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
                 | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
                 | 580 | i960 | h8300 \
-                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \
+                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
                 | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
                 | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-                | 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \
+                | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
                 | mips64orion | mips64orionel | mipstx39 | mipstx39el \
-                | sparc | sparclet | sparclite | sparc64 | v850)
+                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+                | mips64vr5000 | miprs64vr5000el \
+                | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+                | thumb | d10v)
                 basic_machine=$basic_machine-unknown
                 ;;
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+                ;;
+
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
@@ -175,26 +194,41 @@ case $basic_machine in
         vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
               | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
               | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-              | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
               | xmp-* | ymp-* \
-              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-              | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \
+              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+              | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
               | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
               | clipper-* | orion-* \
               | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-              | sparc64-* | mips64-* | mipsel-* \
-              | mips64el-* | mips64orion-* | mips64orionel-*  \
+              | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+              | mips64el-* | mips64orion-* | mips64orionel-* \
+              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
               | mipstx39-* | mipstx39el-* \
-              | f301-* | armv*-*)
+              | f301-* | armv*-* | t3e-* \
+              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+              | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
                 ;;
         # 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
+                ;;
+        adobe68k)
+                basic_machine=m68010-adobe
+                os=-scout
+                ;;
         alliant | fx80)
                 basic_machine=fx80-alliant
                 ;;
@@ -224,6 +258,10 @@ case $basic_machine in
                 basic_machine=m68k-apollo
                 os=-sysv
                 ;;
+        apollo68bsd)
+                basic_machine=m68k-apollo
+                os=-bsd
+                ;;
         aux)
                 basic_machine=m68k-apple
                 os=-aux
@@ -300,6 +338,10 @@ case $basic_machine in
         encore | umax | mmax)
                 basic_machine=ns32k-encore
                 ;;
+        es1800 | OSE68k | ose68k | ose | OSE)
+                basic_machine=m68k-ericsson
+                os=-ose
+                ;;
         fx2800)
                 basic_machine=i860-alliant
                 ;;
@@ -318,6 +360,14 @@ case $basic_machine in
                 basic_machine=h8300-hitachi
                 os=-hms
                 ;;
+        h8300xray)
+                basic_machine=h8300-hitachi
+                os=-xray
+                ;;
+        h8500hms)
+                basic_machine=h8500-hitachi
+                os=-hms
+                ;;
         harris)
                 basic_machine=m88k-harris
                 os=-sysv3
@@ -333,13 +383,30 @@ case $basic_machine in
                 basic_machine=m68k-hp
                 os=-hpux
                 ;;
+        hp3k9[0-9][0-9] | hp9[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
         hp9k2[0-9][0-9] | hp9k31[0-9])
                 basic_machine=m68000-hp
                 ;;
         hp9k3[2-9][0-9])
                 basic_machine=m68k-hp
                 ;;
-        hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+        hp9k6[0-9][0-9] | hp6[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                ;;
+        hp9k7[0-79][0-9] | hp7[0-79][0-9])
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k78[0-9] | hp78[0-9])
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+                # FIXME: really hppa2.0-hp
+                basic_machine=hppa1.1-hp
+                ;;
+        hp9k8[0-9][13679] | hp8[0-9][13679])
                 basic_machine=hppa1.1-hp
                 ;;
         hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -348,13 +415,13 @@ case $basic_machine in
         hppa-next)
                 os=-nextstep3
                 ;;
-        hp3k9[0-9][0-9] | hp9[0-9][0-9])
-                basic_machine=hppa1.0-hp
-                os=-mpeix
+        hppaosf)
+                basic_machine=hppa1.1-hp
+                os=-osf
                 ;;
-        hp3k9[0-9][0-9] | hp9[0-9][0-9])
-                basic_machine=hppa1.0-hp
-                os=-mpeix
+        hppro)
+                basic_machine=hppa1.1-hp
+                os=-proelf
                 ;;
         i370-ibm* | ibm*)
                 basic_machine=i370-ibm
@@ -377,6 +444,22 @@ case $basic_machine in
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-solaris2
                 ;;
+        i386mach)
+                basic_machine=i386-mach
+                os=-mach
+                ;;
+        i386-vsta | vsta)
+                basic_machine=i386-unknown
+                os=-vsta
+                ;;
+        i386-go32 | go32)
+                basic_machine=i386-unknown
+                os=-go32
+                ;;
+        i386-mingw32 | mingw32)
+                basic_machine=i386-unknown
+                os=-mingw32
+                ;;
         iris | iris4d)
                 basic_machine=mips-sgi
                 case $os in
@@ -405,6 +488,10 @@ case $basic_machine in
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
+        *mint | *MiNT)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
         mipsel*-linux*)
                 basic_machine=mipsel-unknown
                 os=-linux-gnu
@@ -419,10 +506,22 @@ case $basic_machine in
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
+        monitor)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
+        msdos)
+                basic_machine=i386-unknown
+                os=-msdos
+                ;;
         ncr3000)
                 basic_machine=i486-ncr
                 os=-sysv4
                 ;;
+        netbsd386)
+                basic_machine=i386-unknown
+                os=-netbsd
+                ;;
         netwinder)
                 basic_machine=armv4l-corel
                 os=-linux
@@ -439,6 +538,10 @@ case $basic_machine in
                 basic_machine=mips-sony
                 os=-newsos
                 ;;
+        necv70)
+                basic_machine=v70-nec
+                os=-sysv
+                ;;
         next | m*-next )
                 basic_machine=m68k-next
                 case $os in
@@ -464,9 +567,25 @@ case $basic_machine in
                 basic_machine=i960-intel
                 os=-nindy
                 ;;
+        mon960)
+                basic_machine=i960-intel
+                os=-mon960
+                ;;
         np1)
                 basic_machine=np1-gould
                 ;;
+        op50n-* | op60c-*)
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        OSE68000 | ose68000)
+                basic_machine=m68000-ericsson
+                os=-ose
+                ;;
+        os68k)
+                basic_machine=m68k-none
+                os=-os68k
+                ;;
         pa-hitachi)
                 basic_machine=hppa1.1-hitachi
                 os=-hiuxwe2
@@ -484,19 +603,19 @@ case $basic_machine in
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5 | k5 | nexen)
+        pentium | p5 | k5 | k6 | nexen)
                 basic_machine=i586-pc
                 ;;
-        pentiumpro | p6 | k6 | 6x86)
+        pentiumpro | p6 | 6x86)
                 basic_machine=i686-pc
                 ;;
         pentiumii | pentium2)
                 basic_machine=i786-pc
                 ;;
-        pentium-* | p5-* | k5-* | nexen-*)
+        pentium-* | p5-* | k5-* | k6-* | nexen-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumpro-* | p6-* | k6-* | 6x86-*)
+        pentiumpro-* | p6-* | 6x86-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pentiumii-* | pentium2-*)
@@ -520,12 +639,20 @@ case $basic_machine in
         ps2)
                 basic_machine=i386-ibm
                 ;;
+        rom68k)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
         rm[46]00)
                 basic_machine=mips-siemens
                 ;;
         rtpc | rtpc-*)
                 basic_machine=romp-ibm
                 ;;
+        sa29200)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
         sequent)
                 basic_machine=i386-sequent
                 ;;
@@ -533,6 +660,10 @@ case $basic_machine in
                 basic_machine=sh-hitachi
                 os=-hms
                 ;;
+        sparclite-wrs)
+                basic_machine=sparclite-wrs
+                os=-vxworks
+                ;;
         sps7)
                 basic_machine=m68k-bull
                 os=-sysv2
@@ -540,6 +671,13 @@ case $basic_machine in
         spur)
                 basic_machine=spur-unknown
                 ;;
+        st2000)
+                basic_machine=m68k-tandem
+                ;;
+        stratus)
+                basic_machine=i860-stratus
+                os=-sysv4
+                ;;
         sun2)
                 basic_machine=m68000-sun
                 ;;
@@ -584,6 +722,10 @@ case $basic_machine in
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
+        t3e)
+                basic_machine=t3e-cray
+                os=-unicos
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -601,6 +743,10 @@ case $basic_machine in
                 basic_machine=a29k-nyu
                 os=-sym1
                 ;;
+        v810 | necv810)
+                basic_machine=v810-nec
+                os=-none
+                ;;
         vaxv)
                 basic_machine=vax-dec
                 os=-sysv
@@ -624,6 +770,14 @@ case $basic_machine in
                 basic_machine=a29k-wrs
                 os=-vxworks
                 ;;
+        w65*)
+                basic_machine=w65-wdc
+                os=-none
+                ;;
+        w89k-*)
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
         xmp)
                 basic_machine=xmp-cray
                 os=-unicos
@@ -631,9 +785,9 @@ case $basic_machine in
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
-        *mint | *MiNT)
-                basic_machine=m68k-atari
-                os=-mint
+        z8k-*-coff)
+                basic_machine=z8k-unknown
+                os=-sim
                 ;;
         none)
                 basic_machine=none-none
@@ -642,6 +796,15 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
+        w89k)
+                basic_machine=hppa1.1-winbond
+                ;;
+        op50n)
+                basic_machine=hppa1.1-oki
+                ;;
+        op60c)
+                basic_machine=hppa1.1-oki
+                ;;
         mips)
                 if [ x$os = x-linux-gnu ]; then
                         basic_machine=mips-unknown
@@ -664,7 +827,7 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sparc)
+        sparc | sparcv9)
                 basic_machine=sparc-sun
                 ;;
         cydra)
@@ -676,6 +839,16 @@ case $basic_machine in
         orion105)
                 basic_machine=clipper-highlevel
                 ;;
+        mac | mpw | mac-mpw)
+                basic_machine=m68k-apple
+                ;;
+        pmac | pmac-mpw)
+                basic_machine=powerpc-apple
+                ;;
+        c4x*)
+                basic_machine=c4x-none
+                os=-coff
+                ;;
         *)
                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                 exit 1
@@ -729,14 +902,21 @@ case $os in
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
               | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
-              | -openstep* | -mpeix* | -oskit*)
+              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
+        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+              | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+                ;;
+        -mac*)
+                os=`echo $os | sed -e 's|mac|macos|'`
+                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
                 ;;
@@ -761,6 +941,9 @@ case $os in
         -acis*)
                 os=-aos
                 ;;
+        -386bsd)
+                os=-bsd
+                ;;
         -ctix* | -uts*)
                 os=-sysv
                 ;;
@@ -792,6 +975,12 @@ case $os in
         # This must come after -sysvr4.
         -sysv*)
                 ;;
+        -ose*)
+                os=-ose
+                ;;
+        -es1800*)
+                os=-ose
+                ;;
         -xenix)
                 os=-xenix
                 ;;
@@ -847,6 +1036,15 @@ case $basic_machine in
                 # default.
                 # os=-sunos4
                 ;;
+        m68*-cisco)
+                os=-aout
+                ;;
+        mips*-cisco)
+                os=-elf
+                ;;
+        mips*-*)
+                os=-elf
+                ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
                 ;;
@@ -859,6 +1057,15 @@ case $basic_machine in
         *-ibm)
                 os=-aix
                 ;;
+        *-wec)
+                os=-proelf
+                ;;
+        *-winbond)
+                os=-proelf
+                ;;
+        *-oki)
+                os=-proelf
+                ;;
         *-hp)
                 os=-hpux
                 ;;
@@ -922,6 +1129,15 @@ case $basic_machine in
         f301-fujitsu)
                 os=-uxpv
                 ;;
+        *-rom68k)
+                os=-coff
+                ;;
+        *-*bug)
+                os=-coff
+                ;;
+        *-apple)
+                os=-macos
+                ;;
         *-atari*)
                 os=-mint
                 ;;
@@ -946,10 +1162,10 @@ case $basic_machine in
                         -aix*)
                                 vendor=ibm
                                 ;;
-                        -hpux*)
-                                vendor=hp
+                        -beos*)
+                                vendor=be
                                 ;;
-                        -mpeix*)
+                        -hpux*)
                                 vendor=hp
                                 ;;
                         -mpeix*)
@@ -982,6 +1198,12 @@ case $basic_machine in
                         -aux*)
                                 vendor=apple
                                 ;;
+                        -hms*)
+                                vendor=hitachi
+                                ;;
+                        -mpw* | -macos*)
+                                vendor=apple
+                                ;;
                         -*mint | -*MiNT)
                                 vendor=atari
                                 ;;