* config/tc-mn10300.c (md_assemble): Update to handle endianness

[binutils.git] / config.sub

diff --git a/config.sub b/config.sub
index 7a0ead0787f536d14bcef3c814ab382f74df4d60..aa25d9b062f4c66e4329fd34c22078f625c0c5d7 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,29 @@
-#!/bin/sh
+#! /bin/sh

 # Configuration validation subroutine script, version 1.1.
 # Configuration validation subroutine script, version 1.1.

-#   Copyright (C) 1991, 1992, 1993, 1994 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. 
-
-#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
-#the Free Software Foundation; either version 2 of the License, or
-#(at your option) any later version.
-
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#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.
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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.

 
 

+# 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.
 
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.


@@ -36,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 ]


@@ -57,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


@@ -77,6 +94,10 @@ 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 | \
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

+       -apple)
+               os=
+               basic_machine=$1
+               ;;

        -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
                os=
                basic_machine=$1
        -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
                os=
                basic_machine=$1


@@ -87,47 +108,50 @@ case $os in
                os=vxworks
                basic_machine=$1
                ;;
                os=vxworks
                basic_machine=$1
                ;;

-       -unixware)                                      # CYGNUS LOCAL
-               os=-sysv4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
-               ;;

        -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
                ;;

-       -os9k)
-               os=-os9k
+       -ptx*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+               ;;
+       -windowsnt*)
+               os=`echo $os | sed -e 's/windowsnt/winnt/'`

                ;;
                ;;

-       -os9)
-               os=-os9
+       -psos*)
+               os=-psos

                ;;
 esac
 
                ;;
 esac
 


@@ -135,34 +159,82 @@ esac
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.

-       tahoe | i[34]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
-               | tron | a29k | 580 | i960 | hppa1.0 | hppa1.1 \
-               | alpha | we32k | ns16k | clipper | sparclite | i370 \
-               | powerpc \
-               | h8300 | h8300h | sh \
-               | m88110 | sparc | m680[01234]0 | m683?2 | z8k | v70 \
-               | v810 \
-               | h8500 | mips64 | mipsel | mips64el \
-               | mips64orion | mips64orionel ) # CYGNUS LOCAL
+       tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
+               | arme[lb] | pyramid \
+               | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
+               | alpha | we32k | ns16k | clipper | i370 | sh \
+               | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+               | pdp11 | mips64el | mips64orion | mips64orionel \
+               | 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
+               ;;
+       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
+               ;;
+# CYGNUS LOCAL law
+       mn10300)

                basic_machine=$basic_machine-unknown
                ;;
                basic_machine=$basic_machine-unknown
                ;;

+       mn10200)
+               basic_machine=$basic_machine-unknown
+               ;;
+# END CYGNUS LOCAL
+# 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[34]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+       vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \

              | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
              | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \

-             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-             | none-* | 580-* | cray2-* | i960-* | xmp-* | ymp-* \
+             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+             | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \

              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
              | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \

-             | powerpc-* \
-             | h8300-* | h8300h-* | sh-* \
-             | m88110-* | m680[01234]0-* | m683?2-* | z8k-* | h8500-* \
-             | mips64-* | mipsel-* | mips64el-* \
-             | mips64orion-* | mips64orionel-* ) # CYGNUS LOCAL
+             | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+             | mips64el-* | mips64orion-* | mips64orionel-*)
+               ;;
+       m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | v850-*) # 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.
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.


@@ -198,7 +270,7 @@ case $basic_machine in
                basic_machine=580-amdahl
                os=-sysv
                ;;
                basic_machine=580-amdahl
                os=-sysv
                ;;

-       amiga)
+       amiga | amiga-*)

                basic_machine=m68k-cbm
                ;;
        amigados)
                basic_machine=m68k-cbm
                ;;
        amigados)


@@ -217,14 +289,21 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-bsd
                ;;
                basic_machine=m68k-apollo
                os=-bsd
                ;;

+# start-sanitize-arc
+       arc)                                            # CYGNUS LOCAL
+               basic_machine=arc-unknown
+               ;;
+       arc-*)                                          # CYGNUS LOCAL
+               ;;
+# end-sanitize-arc
+       aux)
+               basic_machine=m68k-apple
+               os=-aux
+               ;;

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

-       m68k-ccur)
-               basic_machine=m68k-ccur
-               os=-rtu
-               ;;

        convex-c1)
                basic_machine=c1-convex
                os=-bsd
        convex-c1)
                basic_machine=c1-convex
                os=-bsd


@@ -253,10 +332,17 @@ 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
                ;;

-       decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
+       da30 | da30-*)
+               basic_machine=m68k-da30
+               ;;
+       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)

                basic_machine=mips-dec
                ;;
        delta | 3300 | motorola-3300 | motorola-delta \
                basic_machine=mips-dec
                ;;
        delta | 3300 | motorola-3300 | motorola-delta \


@@ -300,19 +386,11 @@ case $basic_machine in
                basic_machine=tron-gmicro
                os=-sysv
                ;;
                basic_machine=tron-gmicro
                os=-sysv
                ;;

-       go32 | i386-go32)                               # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-go32
-               ;;

        h3050r* | hiux*)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
                ;;
        h3050r* | hiux*)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
                ;;

-       h8300hds)
-               basic_machine=h8300-hitachi
-               os=-hds
-               ;;
-       h8300hms)                                       # CYGNUS LOCAL
+       h8300hms)

                basic_machine=h8300-hitachi
                os=-hms
                ;;
                basic_machine=h8300-hitachi
                os=-hms
                ;;


@@ -328,8 +406,8 @@ case $basic_machine in
                basic_machine=m88k-harris
                os=-sysv3
                ;;
                basic_machine=m88k-harris
                os=-sysv3
                ;;

-       h3050r* | hppahitachi)
-               basic_machine=hppa1.1-hitachi
+       hp300-*)
+               basic_machine=m68k-hp

                ;;
        hp300bsd)
                basic_machine=m68k-hp
                ;;
        hp300bsd)
                basic_machine=m68k-hp


@@ -339,6 +417,22 @@ case $basic_machine in
                basic_machine=m68k-hp
                os=-hpux
                ;;
                basic_machine=m68k-hp
                os=-hpux
                ;;

+        w89k-*)                                                # CYGNUS LOCAL
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
+        op50n-*)                                       # CYGNUS LOCAL
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        op60c-*)                                       # CYGNUS LOCAL
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        hppro)                                         # CYGNUS LOCAL
+                basic_machine=hppa1.1-hp
+                os=-proelf
+                ;;

        hp9k2[0-9][0-9] | hp9k31[0-9])
                basic_machine=m68000-hp
                ;;
        hp9k2[0-9][0-9] | hp9k31[0-9])
                basic_machine=m68000-hp
                ;;


@@ -351,65 +445,44 @@ case $basic_machine in
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;

-       hppaosf)
+       hppaosf)                                        # CYGNUS LOCAL

                basic_machine=hppa1.1-hp
                os=-osf
                ;;
                basic_machine=hppa1.1-hp
                os=-osf
                ;;

-       w89k-*)
-               basic_machine=hppa1.1-winbond
-               os=-pro
-               ;;
-       op50n-*)
-               basic_machine=hppa1.1-oki
-               os=-pro
-               ;;
-       op60c-*)
-               basic_machine=hppa1.1-oki
-               os=-pro
-               ;;
-       hppro)
-               basic_machine=hppa1.1-hp
-               os=-pro
-               ;;

        i370-ibm* | ibm*)
                basic_machine=i370-ibm
                os=-mvs
                ;;
        i370-ibm* | ibm*)
                basic_machine=i370-ibm
                os=-mvs
                ;;

-       i386mach)                                       # CYGNUS LOCAL
-               basic_machine=i386-mach
-               os=-mach
-               ;;

 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?

-       i[34]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[34]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[34]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[34]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
                ;;
                os=-solaris2
                ;;

-       i386-linux* | linux)                            # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-linux
+       i386mach)                                       # CYGNUS LOCAL
+               basic_machine=i386-mach
+               os=-mach

                ;;
                ;;

-       i386-linux*coff | linuxcoff)                    # CYGNUS LOCAL
+       i386-vsta | vsta)                               # CYGNUS LOCAL

                basic_machine=i386-unknown
                basic_machine=i386-unknown

-               os=-linuxcoff
+               os=-vsta

                ;;
                ;;

-       i386-linux*elf | linuxelf)                      # CYGNUS LOCAL
+       i386-go32 | go32)                               # CYGNUS LOCAL

                basic_machine=i386-unknown
                basic_machine=i386-unknown

-               os=-linuxelf
+               os=-go32

                ;;
                ;;

-       iris | iris4d | \
-       iris3 | iris4)                                  # CYGNUS LOCAL
+       iris | iris4d)

                basic_machine=mips-sgi
                case $os in
                    -irix*)
                basic_machine=mips-sgi
                case $os in
                    -irix*)


@@ -423,10 +496,6 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
                basic_machine=m68k-isi
                os=-sysv
                ;;

-        m6*bug)                                           # CYGNUS LOCAL
-                basic_machine=m68k-bug
-               os=-coff
-                ;;

        m88k-omron*)
                basic_machine=m88k-omron
                ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;


@@ -439,18 +508,18 @@ case $basic_machine in
                os=-sysv
                ;;
        miniframe)
                os=-sysv
                ;;
        miniframe)

-               basic_machine=m68010-convergent
+               basic_machine=m68000-convergent

                ;;
                ;;

-       mips3-*)                                        # CYGNUS LOCAL
+       mips3*-*)

                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;

-       mips3)                                          # CYGNUS LOCAL
-               basic_machine=mips64-unknown
+       mips3*)
+               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

                ;;
                ;;

-        monitor)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
+       monitor)                                        # CYGNUS LOCAL
+               basic_machine=m68k-rom68k

                os=-coff
                os=-coff

-                ;;
+               ;;

        msdos)                                          # CYGNUS LOCAL
                basic_machine=i386-unknown      
                os=-msdos
        msdos)                                          # CYGNUS LOCAL
                basic_machine=i386-unknown      
                os=-msdos


@@ -459,10 +528,6 @@ case $basic_machine in
                basic_machine=i486-ncr
                os=-sysv4
                ;;
                basic_machine=i486-ncr
                os=-sysv4
                ;;

-       necv70)                                         # CYGNUS LOCAL
-               basic_machine=v70-nec
-               os=-sysv
-               ;;

        netbsd386)
                basic_machine=i386-unknown              # CYGNUS LOCAL
                os=-netbsd
        netbsd386)
                basic_machine=i386-unknown              # CYGNUS LOCAL
                os=-netbsd


@@ -479,10 +544,17 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
                basic_machine=mips-sony
                os=-newsos
                ;;

-       next)
+       necv70)                                         # CYGNUS LOCAL
+               basic_machine=v70-nec
+               os=-sysv
+               ;;
+       next | m*-next )

                basic_machine=m68k-next
                case $os in
                basic_machine=m68k-next
                case $os in

-                   -ns2* | -nextstep2*)
+                   -nextstep* )
+                       ;;
+                   -ns2*)
+                     os=-nextstep2

                        ;;
                    *)
                      os=-nextstep3
                        ;;
                    *)
                      os=-nextstep3


@@ -501,17 +573,21 @@ 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
                ;;

-       os68k)                                          # CYGNUS LOCAL
-               basic_machine=m68k-none
-               os=-os68k
-               ;;

        OSE68000 | ose68000)                            # CYGNUS LOCAL
                basic_machine=m68000-ericsson
                os=-ose
                ;;
        OSE68000 | ose68000)                            # CYGNUS LOCAL
                basic_machine=m68000-ericsson
                os=-ose
                ;;

+       os68k)                                          # CYGNUS LOCAL
+               basic_machine=m68k-none
+               os=-os68k
+               ;;

        pa-hitachi)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
        pa-hitachi)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2


@@ -526,19 +602,54 @@ case $basic_machine in
        pbb)
                basic_machine=m68k-tti
                ;;
        pbb)
                basic_machine=m68k-tti
                ;;

-        pc532)
+        pc532 | pc532-*)

                basic_machine=ns32k-pc532
                ;;
                basic_machine=ns32k-pc532
                ;;

+       pentium | p5)
+               basic_machine=i586-intel
+               ;;
+       pentiumpro | p6)
+               basic_machine=i686-intel
+               ;;
+       pentium-* | p5-*)
+               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
+               ;;
+       nexen)
+               # We don't have specific support for Nexgen yet, so just call it a Pentium
+               basic_machine=i586-nexgen
+               ;;

        pn)
                basic_machine=pn-gould
                ;;
        pn)
                basic_machine=pn-gould
                ;;

+       power)  basic_machine=rs6000-ibm
+               ;;
+       ppc)    basic_machine=powerpc-unknown
+               ;;
+       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ppcle | powerpclittle | ppc-le | powerpc-little)
+               basic_machine=powerpcle-unknown
+               ;;
+       ppcle-* | powerpclittle-*)
+               basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;

        ps2)
                basic_machine=i386-ibm
                ;;
        ps2)
                basic_machine=i386-ibm
                ;;

-        rom68k)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
+       rom68k)                                         # CYGNUS LOCAL
+               basic_machine=m68k-rom68k

                os=-coff
                os=-coff

-                ;;
+               ;;
+       rm[46]00)
+               basic_machine=mips-siemens
+               ;;

        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;


@@ -546,35 +657,17 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;

-       sh*)                                            # CYGNUS LOCAL
+       sequent)
+               basic_machine=i386-sequent
+               ;;
+       sh)

                basic_machine=sh-hitachi
                os=-hms
                ;;
                basic_machine=sh-hitachi
                os=-hms
                ;;

-       sparc64)                                        # CYGNUS LOCAL
-               basic_machine=sparc64-sun
-               os=-elf
-               ;;
-       sparc64-*)                                      # CYGNUS LOCAL
-               ;;
-

        sparclite-wrs)                                  # CYGNUS LOCAL
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
        sparclite-wrs)                                  # CYGNUS LOCAL
                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


@@ -616,11 +709,11 @@ case $basic_machine in
                basic_machine=sparc-sun
                os=-sunos4
                ;;
                basic_machine=sparc-sun
                os=-sunos4
                ;;

-       sun4sol2)                                       # CYGNUS LOCAL
+       sun4sol2)

                basic_machine=sparc-sun
                os=-solaris2
                ;;
                basic_machine=sparc-sun
                os=-solaris2
                ;;

-       sun3)
+       sun3 | sun3-*)

                basic_machine=m68k-sun
                ;;
        sun4)
                basic_machine=m68k-sun
                ;;
        sun4)


@@ -636,7 +729,7 @@ case $basic_machine in
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;

-       udi29k)                                         # CYGNUS LOCAL
+       udi29k)

                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;


@@ -644,11 +737,7 @@ case $basic_machine in
                basic_machine=a29k-nyu
                os=-sym1
                ;;
                basic_machine=a29k-nyu
                os=-sym1
                ;;

-       unixware)                                       # CYGNUS LOCAL
-               os=-sysv4
-               basic_machine=i386-unknown
-               ;;
-       v810 | necv810)
+       v810 | necv810)                                 # CYGNUS LOCAL

                basic_machine=v810-nec
                os=-none
                ;;
                basic_machine=v810-nec
                os=-none
                ;;


@@ -668,9 +757,13 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
                basic_machine=m68k-wrs
                os=-vxworks
                ;;

-       vsta | i386-vsta)                               # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-vsta
+       vxworks29k)
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;
+       w65*)                                           # CYGNUS LOCAL
+               basic_machine=w65-wdc
+               os=-none

                ;;
        xmp)
                basic_machine=xmp-cray
                ;;
        xmp)
                basic_machine=xmp-cray


@@ -679,8 +772,8 @@ case $basic_machine in
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;

-       z8ksim)                                         # CYGNUS LOCAL
-               basic_machine=z8k-zilog
+       z8k-*-coff)                                     # CYGNUS LOCAL
+               basic_machine=z8k-unknown

                os=-sim
                ;;
        none)
                os=-sim
                ;;
        none)


@@ -690,13 +783,13 @@ 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.
 
 # 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)                                   # CYGNUS LOCAL
+       w89k)                                           # CYGNUS LOCAL

                basic_machine=hppa1.1-winbond
                ;;
                basic_machine=hppa1.1-winbond
                ;;

-       op50n)                                  # CYGNUS LOCAL
+       op50n)                                          # CYGNUS LOCAL

                basic_machine=hppa1.1-oki
                ;;
                basic_machine=hppa1.1-oki
                ;;

-       op60c)                                  # CYGNUS LOCAL
+       op60c)                                          # CYGNUS LOCAL

                basic_machine=hppa1.1-oki
                ;;
        mips)
                basic_machine=hppa1.1-oki
                ;;
        mips)


@@ -711,6 +804,9 @@ case $basic_machine in
        vax)
                basic_machine=vax-dec
                ;;
        vax)
                basic_machine=vax-dec
                ;;

+       pdp11)
+               basic_machine=pdp11-dec
+               ;;

        we32k)
                basic_machine=we32k-att
                ;;
        we32k)
                basic_machine=we32k-att
                ;;


@@ -726,14 +822,12 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
        orion105)
                basic_machine=clipper-highlevel
                ;;

-## start-sanitize-mpw
-       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

                ;;
                ;;

-## end-sanitize-mpw

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


@@ -757,6 +851,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|'`


@@ -764,23 +860,42 @@ case $os in
        -solaris)
                os=-solaris2
                ;;
        -solaris)
                os=-solaris2
                ;;

+       -unixware* | svr4*)
+               os=-sysv4
+               ;;
+       -gnu/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[34]* | -hpux* \
-             | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-             | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -freebsd* | -nextstep* \
-             | -riscix* | -lynxos* | -go32 | -vsta | -pro | -proelf \
-             | -sim | -es1800* | -udi | -hms* | -xray | -hds* \
-             | -os68k* | -none* | -v88r* | -aout* | -coff | -elf* | -bosx* \
-             | -abug | -ecoff* | -netware* | -os9* )
-                               # The last three lines above are CYGNUS LOCAL
-       ;;
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+             | -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* \
+             | -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
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug |  -netware* | -os9* \
+             | -macos* | -mpw* | -magic* | -mon960*)
+               ;;
+       -mac*)
+               os=`echo $os | sed -e 's|mac|macos|'`
+               ;;
+       # 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|'`
                ;;


@@ -808,6 +923,16 @@ 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|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;

        -triton*)
                os=-sysv3
                ;;
        -triton*)
                os=-sysv3
                ;;


@@ -817,9 +942,6 @@ case $os in
        -svr4)
                os=-sysv4
                ;;
        -svr4)
                os=-sysv4
                ;;

-       -unixware)
-               os=-sysv4
-               ;;

        -svr3)
                os=-sysv3
                ;;
        -svr3)
                os=-sysv3
                ;;


@@ -835,9 +957,6 @@ case $os in
        -es1800*)                                       # CYGNUS LOCAL
                os=-ose
                ;;
        -es1800*)                                       # CYGNUS LOCAL
                os=-ose
                ;;

-       -cxux7*)
-               os=-cxux7
-               ;;

        -xenix)
                os=-xenix
                ;;
        -xenix)
                os=-xenix
                ;;


@@ -845,7 +964,7 @@ case $os in
                ;;
        *)
                # Get rid of the `-' at the beginning of $os.
                ;;
        *)
                # Get rid of the `-' at the beginning of $os.

-               os=`echo $1 | sed 's/[^-]*-//'`
+               os=`echo $os | sed 's/[^-]*-//'`

                echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
                exit 1
                ;;
                echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
                exit 1
                ;;


@@ -866,9 +985,18 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
        *-acorn)
                os=-riscix1.2
                ;;

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

        *-dec | vax-*)
                os=-ultrix4.2
                ;;
        *-dec | vax-*)
                os=-ultrix4.2
                ;;

+       m68*-apollo)
+               os=-domain
+               ;;

        i386-sun)
                os=-sunos4.0.2
                ;;
        i386-sun)
                os=-sunos4.0.2
                ;;


@@ -878,10 +1006,10 @@ case $basic_machine in
                # default.
                # os=-sunos4
                ;;
                # default.
                # os=-sunos4
                ;;

-       m68*-cisco)
+       m68*-cisco)                                     # CYGNUS LOCAL

                os=-aout
                ;;
                os=-aout
                ;;

-       mips*-cisco)
+       mips*-cisco)                                    # CYGNUS LOCAL

                os=-elf
                ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-elf
                ;;
        *-tti)  # must be before sparc entry or we get the wrong os.


@@ -893,17 +1021,17 @@ case $basic_machine in
        *-ibm)
                os=-aix
                ;;
        *-ibm)
                os=-aix
                ;;

-       *-hp)
-               os=-hpux
-               ;;

        *-wec)                                          # CYGNUS LOCAL
        *-wec)                                          # CYGNUS LOCAL

-               os=-pro
+               os=-proelf

                ;;
        *-winbond)                                      # CYGNUS LOCAL
                ;;
        *-winbond)                                      # CYGNUS LOCAL

-               os=-pro
+               os=-proelf

                ;;
        *-oki)                                          # CYGNUS LOCAL
                ;;
        *-oki)                                          # CYGNUS LOCAL

-               os=-pro
+               os=-proelf
+               ;;
+       *-hp)
+               os=-hpux

                ;;
        *-hitachi)
                os=-hiux
                ;;
        *-hitachi)
                os=-hiux


@@ -920,11 +1048,17 @@ case $basic_machine in
        *-dolphin)
                os=-sysv3
                ;;
        *-dolphin)
                os=-sysv3
                ;;

+       m68k-ccur)
+               os=-rtu
+               ;;

        m88k-omron*)
                os=-luna
                ;;
        m88k-omron*)
                os=-luna
                ;;

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

        *-sequent)
        *-sequent)

-               os=-bsd
+               os=-ptx

                ;;
        *-crds)
                os=-unos
                ;;
        *-crds)
                os=-unos


@@ -936,10 +1070,7 @@ case $basic_machine in
                os=-mvs
                ;;
        *-next)
                os=-mvs
                ;;
        *-next)

-               os=-nextstep
-               ;;
-       i[34]86-*)
-               os=-sco3.2v2
+               os=-nextstep3

                ;;
         *-gould)
                os=-sysv
                ;;
         *-gould)
                os=-sysv


@@ -953,6 +1084,9 @@ case $basic_machine in
         *-sgi)
                os=-irix
                ;;
         *-sgi)
                os=-irix
                ;;

+        *-siemens)
+               os=-sysv4
+               ;;

        *-masscomp)
                os=-rtu
                ;;
        *-masscomp)
                os=-rtu
                ;;


@@ -962,11 +1096,9 @@ case $basic_machine in
        *-*bug)                                         # CYGNUS LOCAL
                os=-coff
                ;;
        *-*bug)                                         # CYGNUS LOCAL
                os=-coff
                ;;

-## start-sanitize-mpw

        *-apple)                                        # CYGNUS LOCAL
        *-apple)                                        # CYGNUS LOCAL

-               os=-mpw
+               os=-macos

                ;;
                ;;

-## end-sanitize-mpw

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


@@ -985,7 +1117,7 @@ case $basic_machine in
                        -sunos*)
                                vendor=sun
                                ;;
                        -sunos*)
                                vendor=sun
                                ;;

-                       -bosx*)                 # CYGNUS LOCAL
+                       -bosx*)                         # CYGNUS LOCAL

                                vendor=bull
                                ;;
                        -lynxos*)
                                vendor=bull
                                ;;
                        -lynxos*)


@@ -1015,17 +1147,21 @@ case $basic_machine in
                        -mvs*)
                                vendor=ibm
                                ;;
                        -mvs*)
                                vendor=ibm
                                ;;

-                       -vxworks*)
-                               vendor=wrs              # CYGNUS LOCAL
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+                       -vxsim* | -vxworks*)
+                               vendor=wrs
+                               ;;
+                       -aux*)
+                               vendor=apple

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

-## start-sanitize-mpw
-                       -mpw*)                          # CYGNUS LOCAL
+                       -mpw* | -macos*)                # CYGNUS LOCAL

                                vendor=apple
                                ;;
                                vendor=apple
                                ;;

-## end-sanitize-mpw

                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;
                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;