* configure.host: Use `long long' as the 64 bit type on a Solaris

[binutils.git] / config.sub

diff --git a/config.sub b/config.sub
index ae7660ff5ba13e860c3ae7ba4652bf99ee1cf1fb..6175c990d77713c00a41ffdba8195d890064d2e2 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.

-#   Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92, 93, 94, 95, 1996 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
 # 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. 
+# can handle that machine.  It does not imply ALL GNU software can.

 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -17,7 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.

 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a


@@ -40,6 +41,8 @@
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM

+# or in some cases, the newer four-part form:
+#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM

 # It is wrong to echo any other type of specification.
 
 if [ x$1 = x ]
 # It is wrong to echo any other type of specification.
 
 if [ x$1 = x ]


@@ -61,11 +64,21 @@ case $1 in
        ;;
 esac
 
        ;;
 esac
 

-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac

 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also
 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also


@@ -80,7 +93,8 @@ case $os in
        -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

-       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+       -apple)

                os=
                basic_machine=$1
                ;;
                os=
                basic_machine=$1
                ;;


@@ -101,31 +115,35 @@ case $os in
        -hiux*)
                os=-hiuxwe2
                ;;
        -hiux*)
                os=-hiuxwe2
                ;;

+       -sco5)
+               os=sco3.2v5
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;

        -sco4)
                os=-sco3.2v4
        -sco4)
                os=-sco3.2v4

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -sco3.2.[4-9]*)
                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
                ;;
        -sco3.2.[4-9]*)
                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -sco3.2v[4-9]*)
                # Don't forget version if it is 3.2v4 or newer.
                ;;
        -sco3.2v[4-9]*)
                # Don't forget version if it is 3.2v4 or newer.

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -sco*)
                os=-sco3.2v2
                ;;
        -sco*)
                os=-sco3.2v2

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -isc)
                os=-isc2.2
                ;;
        -isc)
                os=-isc2.2

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -clix*)
                basic_machine=clipper-intergraph
                ;;
        -isc*)
                ;;
        -clix*)
                basic_machine=clipper-intergraph
                ;;
        -isc*)

-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

                ;;
        -lynx*)
                os=-lynxos
                ;;
        -lynx*)
                os=-lynxos


@@ -136,32 +154,71 @@ case $os in
        -windowsnt*)
                os=`echo $os | sed -e 's/windowsnt/winnt/'`
                ;;
        -windowsnt*)
                os=`echo $os | sed -e 's/windowsnt/winnt/'`
                ;;

+       -psos*)
+               os=-psos
+               ;;

 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.

-       tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | armeb \
-               | armel | pyramid \
+       tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
+               | arme[lb] | pyramid \

                | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
                | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \

-               | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
-               | powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
+               | alpha | we32k | ns16k | clipper | i370 | sh \
+               | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \

                | pdp11 | mips64el | mips64orion | mips64orionel \
                | pdp11 | mips64el | mips64orion | mips64orionel \

-               | sparc)
+               | sparc | sparclet | sparclite | sparc64)

                basic_machine=$basic_machine-unknown
                ;;
        m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
                basic_machine=$basic_machine-unknown
                ;;
                basic_machine=$basic_machine-unknown
                ;;
        m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
                basic_machine=$basic_machine-unknown
                ;;

+       mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith/vr4300
+               basic_machine=$basic_machine-unknown
+               ;;
+       mips64vr4100 | mips64vr4100el) # CYGNUS LOCAL jsmith/vr4100
+               basic_machine=$basic_machine-unknown
+               ;;
+       mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
+               basic_machine=$basic_machine-unknown
+               ;;
+# start-sanitize-v850
+       v850)                           # CYGNUS LOCAL jtc/v850
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-v850
+# start-sanitize-d10v
+       d10v)                           # CYGNUS LOCAL meissner/d10v
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-d10v
+# start-sanitize-m32r
+       m32r)                           # CYGNUS LOCAL
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-m32r
+       mn10200)                        # CYGNUS LOCAL
+               basic_machine=$basic_machine-unknown
+               ;;
+       mn10300)                        # CYGNUS LOCAL
+               basic_machine=$basic_machine-unknown
+               ;;
+       # We use `pc' rather than `unknown'
+       # because (1) that's what they normally are, and
+       # (2) the word "unknown" tends to confuse beginning users.
+       i[3456]86)
+         basic_machine=$basic_machine-pc
+         ;;

        # Object if more than one company name word.
        *-*-*)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
                ;;
        # Recognize the basic CPU types with company name.
        # Object if more than one company name word.
        *-*-*)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
                ;;
        # Recognize the basic CPU types with company name.

-       vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-             | sparc-* | ns32k-* | fx80-* | arm-* | arme[lb]-* | c[123]* \
+       vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+             | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \

              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \


@@ -171,6 +228,10 @@ case $basic_machine in
                ;;
        m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-*) # CYGNUS LOCAL
                ;;
                ;;
        m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-*) # CYGNUS LOCAL
                ;;

+       mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith/vr4300
+               ;;
+       mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
+               ;;

        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)                                         # CYGNUS LOCAL
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)                                         # CYGNUS LOCAL


@@ -224,17 +285,17 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-bsd
                ;;
                basic_machine=m68k-apollo
                os=-bsd
                ;;

-       arm | armel | armeb)
-               basic_machine = arm-arm
-               os=-aout
-               ;;

 # start-sanitize-arc
 # start-sanitize-arc

-       arc)
+       arc)                                            # CYGNUS LOCAL

                basic_machine=arc-unknown
                ;;
                basic_machine=arc-unknown
                ;;

-       arc-*)
+       arc-*)                                          # CYGNUS LOCAL

                ;;
 # end-sanitize-arc
                ;;
 # end-sanitize-arc

+       aux)
+               basic_machine=m68k-apple
+               os=-aux
+               ;;

        balance)
                basic_machine=ns32k-sequent
                os=-dynix
        balance)
                basic_machine=ns32k-sequent
                os=-dynix


@@ -267,6 +328,10 @@ case $basic_machine in
                basic_machine=cray2-cray
                os=-unicos
                ;;
                basic_machine=cray2-cray
                os=-unicos
                ;;

+       [ctj]90-cray)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;

        crds | unos)
                basic_machine=m68k-crds
                ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;


@@ -385,20 +450,20 @@ case $basic_machine in
                os=-mvs
                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
                os=-mvs
                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?

-       i[345]86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+       i[3456]86v32)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

                os=-sysv32
                ;;
                os=-sysv32
                ;;

-       i[345]86v4*)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+       i[3456]86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

                os=-sysv4
                ;;
                os=-sysv4
                ;;

-       i[345]86v)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+       i[3456]86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

                os=-sysv
                ;;
                os=-sysv
                ;;

-       i[345]86sol2)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+       i[3456]86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

                os=-solaris2
                ;;
        i386mach)                                       # CYGNUS LOCAL
                os=-solaris2
                ;;
        i386mach)                                       # CYGNUS LOCAL


@@ -504,6 +569,10 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-nindy
                ;;
                basic_machine=i960-intel
                os=-nindy
                ;;

+       mon960)                                         # CYGNUS LOCAL
+               basic_machine=i960-intel
+               os=-mon960
+               ;;

        np1)
                basic_machine=np1-gould
                ;;
        np1)
                basic_machine=np1-gould
                ;;


@@ -532,19 +601,23 @@ case $basic_machine in
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;

-       pentium | p5 | p6)
-               # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
+       pentium | p5)

                basic_machine=i586-intel
                ;;
                basic_machine=i586-intel
                ;;

-       pentium-* | p5-* | p6-*)
-               # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
+       pentiumpro | p6)
+               basic_machine=i686-intel
+               ;;
+       pentium-* | p5-*)

                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;

+       pentiumpro-* | p6-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;

        k5)
                # We don't have specific support for AMD's K5 yet, so just call it a Pentium
                basic_machine=i586-amd
                ;;
        k5)
                # We don't have specific support for AMD's K5 yet, so just call it a Pentium
                basic_machine=i586-amd
                ;;

-       nexgen)
+       nexen)

                # We don't have specific support for Nexgen yet, so just call it a Pentium
                basic_machine=i586-nexgen
                ;;
                # We don't have specific support for Nexgen yet, so just call it a Pentium
                basic_machine=i586-nexgen
                ;;


@@ -566,13 +639,6 @@ case $basic_machine in
        ps2)
                basic_machine=i386-ibm
                ;;
        ps2)
                basic_machine=i386-ibm
                ;;

-# start-sanitize-rce
-       rce)
-               basic_machine=rce-unknown
-               ;;
-       rce-*)
-               ;;
-# end-sanitize-rce

        rom68k)                                         # CYGNUS LOCAL
                basic_machine=m68k-rom68k
                os=-coff
        rom68k)                                         # CYGNUS LOCAL
                basic_machine=m68k-rom68k
                os=-coff


@@ -598,20 +664,6 @@ case $basic_machine in
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;

-       sparcfrw)                                       # CYGNUS LOCAL
-               basic_machine=sparcfrw-sun
-               os=-sunos4
-               ;;
-       sparcfrwcompat)                                 # CYGNUS LOCAL
-               basic_machine=sparcfrwcompat-sun
-               os=-sunos4
-               ;;
-       sparclitefrw)                                   # CYGNUS LOCAL
-               basic_machine=sparclitefrw-fujitsu
-               ;;
-       sparclitefrwcompat)                             # CYGNUS LOCAL
-               basic_machine=sparclitefrwcompat-fujitsu
-               ;;

        sps7)
                basic_machine=m68k-bull
                os=-sysv2
        sps7)
                basic_machine=m68k-bull
                os=-sysv2


@@ -701,10 +753,10 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
                basic_machine=m68k-wrs
                os=-vxworks
                ;;

-        vxworks29k)                                    # CYGNUS LOCAL
-                basic_machine=a29k-wrs
-                os=-vxworks
-                ;;
+       vxworks29k)
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;

        w65*)                                           # CYGNUS LOCAL
                basic_machine=w65-wdc
                os=-none
        w65*)                                           # CYGNUS LOCAL
                basic_machine=w65-wdc
                os=-none


@@ -716,7 +768,7 @@ case $basic_machine in
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;

-       z8ksim)                                         # CYGNUS LOCAL
+       z8k-*-coff)                                     # CYGNUS LOCAL

                basic_machine=z8k-unknown
                os=-sim
                ;;
                basic_machine=z8k-unknown
                os=-sim
                ;;


@@ -766,11 +818,11 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
        orion105)
                basic_machine=clipper-highlevel
                ;;

-       mac)                                            # CYGNUS LOCAL
+       mac | mpw | mac-mpw)                            # CYGNUS LOCAL

                basic_machine=m68k-apple
                ;;
                basic_machine=m68k-apple
                ;;

-       mpw)                                            # CYGNUS LOCAL
-               basic_machine=m68k-apple
+       pmac | pmac-mpw)                                # CYGNUS LOCAL
+               basic_machine=powerpc-apple

                ;;
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                ;;
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2


@@ -795,6 +847,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
 if [ x"$os" != x"" ]
 then
 case $os in

+        # 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|'`
        # -solaris* is a basic system type, with this one exception.
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`


@@ -806,36 +860,37 @@ case $os in
                os=-sysv4
                ;;
        -gnu/linux*)
                os=-sysv4
                ;;
        -gnu/linux*)

-               os=`echo $os | sed -e 's|gnu/linux|linux|'`
+               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`

                ;;
        # First accept the basic system types.
        # The portable systems comes first.
                ;;
        # First accept the basic system types.
        # The portable systems comes first.

-       # Each alternative must end in a *, to match a version number.
+       # Each alternative MUST END IN A *, to match a version number.

        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \

-             | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\

              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \

-             | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
-             | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix*  | -lites* \
+             | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+             | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \

              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \

-             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi)
+             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+             | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -linux-gnu*)
+       # Remember, each alternative MUST END IN *, to match a version number.

                ;;
        # CYGNUS LOCAL
                ;;
        # CYGNUS LOCAL

-       -go32 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug |  -netware* | -proelf | -os9*)
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug |  -netware* | -os9* \
+             | -macos* | -mpw* | -magic* | -mon960*)

                ;;
                ;;

-       -macos*)                                        # CYGNUS LOCAL
-               ;;
-       -mac*)                                          # CYGNUS LOCAL
+       -mac*)

                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;

-       -mpw*)                                          # CYGNUS LOCAL
-               ;;
-       -pe*)
-               ;;
-       -win32)
+       # END CYGNUS LOCAL
+       -linux*)
+               os=`echo $os | sed -e 's|linux|linux-gnu|'`

                ;;
        -sunos5*)
                os=`echo $os | sed -e 's|sunos5|solaris2|'`
                ;;
        -sunos5*)
                os=`echo $os | sed -e 's|sunos5|solaris2|'`


@@ -864,6 +919,9 @@ case $os in
        -ctix* | -uts*)
                os=-sysv
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;

+       -ns2 )
+               os=-nextstep2
+               ;;

        # Preserve the version number of sinix5.
        -sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`
        # Preserve the version number of sinix5.
        -sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`


@@ -923,6 +981,9 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
        *-acorn)
                os=-riscix1.2
                ;;

+       arm*-semi)
+               os=-aout
+               ;;

         pdp11-*)
                os=-none
                ;;
         pdp11-*)
                os=-none
                ;;


@@ -989,6 +1050,9 @@ case $basic_machine in
        m88k-omron*)
                os=-luna
                ;;
        m88k-omron*)
                os=-luna
                ;;

+       *-next )
+               os=-nextstep
+               ;;

        *-sequent)
                os=-ptx
                ;;
        *-sequent)
                os=-ptx
                ;;


@@ -1029,7 +1093,7 @@ case $basic_machine in
                os=-coff
                ;;
        *-apple)                                        # CYGNUS LOCAL
                os=-coff
                ;;
        *-apple)                                        # CYGNUS LOCAL

-               os=-macos7
+               os=-macos

                ;;
        *)
                os=-none
                ;;
        *)
                os=-none


@@ -1082,9 +1146,12 @@ case $basic_machine in
                        -ptx*)
                                vendor=sequent
                                ;;
                        -ptx*)
                                vendor=sequent
                                ;;

-                       -vxworks*)
+                       -vxsim* | -vxworks*)

                                vendor=wrs
                                ;;
                                vendor=wrs
                                ;;

+                       -aux*)
+                               vendor=apple
+                               ;;

                        -hms*)                          # CYGNUS LOCAL
                                vendor=hitachi
                                ;;
                        -hms*)                          # CYGNUS LOCAL
                                vendor=hitachi
                                ;;