* config.sub: Merge in recent FSF changes.

diff --git a/ChangeLog b/ChangeLog
index ad4b0f7d379f66e185784455e0e58e68c1e4ac1c..a53c553fc0c750e5d582337a9cfaaedc0c1832c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 30 13:51:43 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+       * config.sub: Merge in recent FSF changes.
+
 Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
        build-all.mk,config/mh-solaris:  revert these two changes:

diff --git a/config.sub b/config.sub
index 5755db65bd3cd253e91b3203435d7dee08b4c671..2d0861ace690538b4f4d9eb365ef5f82b6cf3fb8 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
-#!/bin/sh
+#! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 1992, 1993, 1994, 1995 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. 
@@ -19,6 +19,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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.
 
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -96,10 +100,6 @@ case $os in
                os=vxworks
                basic_machine=$1
                ;;
-       -unixware)                                      # CYGNUS LOCAL
-               os=-sysv4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
-               ;;
        -hiux*)
                os=-hiuxwe2
                ;;
@@ -148,7 +148,7 @@ case $basic_machine in
                | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
                | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
                | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
-               | mips64el | mips64orion | mips64orionel \
+               | pdp11 | mips64el | mips64orion | mips64orionel \
                | sparc)
                basic_machine=$basic_machine-unknown
                ;;
@@ -167,7 +167,7 @@ case $basic_machine in
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-             | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \
+             | pdp11-* | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \
              | mips64el-* | mips64orion-* | mips64orionel-*)
                ;;
        m88110-* | m680[01234]0-* | m683?2-* | z8k-* | h8500-*) # CYGNUS LOCAL
@@ -422,8 +422,7 @@ case $basic_machine in
                basic_machine=i386-unknown
                os=-linuxelf
                ;;
-       iris | iris4d | \
-       iris3 | iris4)                                  # CYGNUS LOCAL
+       iris | iris4d)
                basic_machine=mips-sgi
                case $os in
                    -irix*)
@@ -564,6 +563,9 @@ case $basic_machine in
                basic_machine=m68k-rom68k
                os=-coff
                ;;
+       rm[46]00)
+               basic_machine=mips-siemens
+               ;;
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
@@ -637,7 +639,7 @@ case $basic_machine in
                basic_machine=sparc-sun
                os=-sunos4
                ;;
-       sun4sol2)                                       # CYGNUS LOCAL
+       sun4sol2)
                basic_machine=sparc-sun
                os=-solaris2
                ;;
@@ -665,10 +667,6 @@ case $basic_machine in
                basic_machine=a29k-nyu
                os=-sym1
                ;;
-       unixware)                                       # CYGNUS LOCAL
-               os=-sysv4
-               basic_machine=i386-unknown
-               ;;
        v810 | necv810)                                 # CYGNUS LOCAL
                basic_machine=v810-nec
                os=-none
@@ -689,7 +687,11 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
-       w65*)
+        vxworks29k)                                    # CYGNUS LOCAL
+                basic_machine=a29k-wrs
+                os=-vxworks
+                ;;
+       w65*)                                           # CYGNUS LOCAL
                basic_machine=w65-wdc
                os=-none
                ;;
@@ -732,6 +734,9 @@ case $basic_machine in
        vax)
                basic_machine=vax-dec
                ;;
+       pdp11)
+               basic_machine=pdp11-dec
+               ;;
        we32k)
                basic_machine=we32k-att
                ;;
@@ -785,6 +790,9 @@ case $os in
        -solaris)
                os=-solaris2
                ;;
+       -unixware* | svr4*)
+               os=-sysv4
+               ;;
        -gnu/linux*)
                os=`echo $os | sed -e 's|gnu/linux|linux|'`
                ;;
@@ -800,7 +808,7 @@ case $os in
              | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-             | -ptx* | -coff* | -ecoff* | -winnt* | -vsta | -udi | -eabi*)
+             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi)
                ;;
        # CYGNUS LOCAL
        -go32 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -815,6 +823,10 @@ case $os in
        -mpw*)
                ;;
 ## end-sanitize-mpw
+# start-sanitize-psion
+       -pe*)
+               ;;
+# end-sanitize-psion
        -sunos5*)
                os=`echo $os | sed -e 's|sunos5|solaris2|'`
                ;;
@@ -842,6 +854,13 @@ case $os in
        -ctix* | -uts*)
                os=-sysv
                ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+               os=`echo $os | sed -e 's|sinix|sysv|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;
        -triton*)
                os=-sysv3
                ;;
@@ -851,9 +870,6 @@ case $os in
        -svr4)
                os=-sysv4
                ;;
-       -unixware)                      # CYGNUS LOCAL
-               os=-sysv4
-               ;;
        -svr3)
                os=-sysv3
                ;;
@@ -897,9 +913,15 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
+        pdp11-*)
+               os=-none
+               ;;
        *-dec | vax-*)
                os=-ultrix4.2
                ;;
+       m68*-apollo)
+               os=-domain
+               ;;
        i386-sun)
                os=-sunos4.0.2
                ;;
@@ -984,6 +1006,9 @@ case $basic_machine in
         *-sgi)
                os=-irix
                ;;
+        *-siemens)
+               os=-sysv4
+               ;;
        *-masscomp)
                os=-rtu
                ;;
@@ -1016,7 +1041,7 @@ case $basic_machine in
                        -sunos*)
                                vendor=sun
                                ;;
-                       -bosx*)                 # CYGNUS LOCAL
+                       -bosx*)                         # CYGNUS LOCAL
                                vendor=bull
                                ;;
                        -lynxos*)