Protoization.

[binutils.git] / config.sub

diff --git a/config.sub b/config.sub
index b64ec52c9e2474650dc7a4174f99cb071ae2d501..2b4fad13ff0b2901e72a13d6a02793ecd0888152 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,25 +1,36 @@
-#!/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.
-# 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.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.

 
 

-#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.
+version='2000-07-06'

 
 

-#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.
+# 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., 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.

 
 

+# Please send patches to <[email protected]>.
+#

 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.


@@ -36,32 +47,75 @@
 # 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.
 
 # It is wrong to echo any other type of specification.
 

-if [ x$1 = x ]                                         # CYGNUS LOCAL
-then
-       echo Configuration name missing. 1>&2
-       echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-       echo "or     $0 ALIAS" 1>&2
-       echo where ALIAS is a recognized configuration type. 1>&2
-       exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`

 
 

-# First pass through any local machine types.
-case $1 in
-       *local*)
-               echo $1
-               exit 0
-               ;;
-       *)
-       ;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case "$1" in
+    --version | --vers* | -V )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;

 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
+  nto-qnx* | 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,90 +131,142 @@ 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 | \

-       -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
+       -apple | -axis)

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

-       -scout)                                         # CYGNUS LOCAL
-               ;;
-       -wrs)                                           # CYGNUS LOCAL
-               os=vxworks
+       -sim | -cisco | -oki | -wec | -winbond)
+               os=

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

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

                ;;
        -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/'`
+               ;;
+       -udk*)
+               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*)                 # CYGNUS LOCAL: lynx
+       -lynx*)

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

+       -windowsnt*)
+               os=`echo $os | sed -e 's/windowsnt/winnt/'`
+               ;;
+       -psos*)
+               os=-psos
+               ;;
+       -mint | -mint[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;

 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 | pyramid \
-               | 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 \
-               | m88110 | sparc | m680[01234]0 | m683?2 | z8k | v70 \
-               | h8500 | h8300h) # CYGNUS LOCAL
+       tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+               | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+               | 580 | i960 | h8300 \
+               | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+               | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+               | hppa64 \
+               | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+               | alphaev6[78] \
+               | we32k | ns16k | clipper | i370 | sh | sh[34] \
+               | powerpc | powerpcle \
+               | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+               | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+               | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+               | mips64vr5000 | miprs64vr5000el | mcore \
+               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+               | thumb | d10v | d30v | fr30 | avr)

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

+       m6811 | m68hc11 | m6812 | m68hc12)
+               # Motorola 68HC11/12.
+               basic_machine=$basic_machine-unknown
+               os=-none
+               ;;
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+               ;;
+
+       # 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[234567]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-* | c[123]* \
+       # FIXME: clean up the formatting here.
+       vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \

              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \

-             | 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-* \
+             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+             | xmp-* | ymp-* \
+             | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+             | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+             | hppa2.0n-* | hppa64-* \
+             | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+             | alphaev6[78]-* \
+             | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+             | clipper-* | orion-* \
+             | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+             | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \

              | mips64el-* | mips64orion-* | mips64orionel-* \
              | mips64el-* | mips64orion-* | mips64orionel-* \

-             | m88110-* | m680[01234]0-* | m683?2-* | z8k-* \
-             | h8500-* | h8300h-* ) # CYGNUS LOCAL
+             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+             | mipstx39-* | mipstx39el-* | mcore-* \
+             | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+             | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+             | bs2000-* | tic54x-* | c54x-*)

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

-       386bsd)                                         # CYGNUS LOCAL
+       386bsd)

                basic_machine=i386-unknown
                os=-bsd
                ;;
                basic_machine=i386-unknown
                os=-bsd
                ;;


@@ -170,11 +276,11 @@ case $basic_machine in
        3b*)
                basic_machine=we32k-att
                ;;
        3b*)
                basic_machine=we32k-att
                ;;

-       a29khif)                                        # CYGNUS LOCAL
+       a29khif)

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

-       adobe68k)                                       # CYGNUS LOCAL
+       adobe68k)

                basic_machine=m68010-adobe
                os=-scout
                ;;
                basic_machine=m68010-adobe
                os=-scout
                ;;


@@ -195,9 +301,9 @@ case $basic_machine in
        amiga | amiga-*)
                basic_machine=m68k-cbm
                ;;
        amiga | amiga-*)
                basic_machine=m68k-cbm
                ;;

-       amigados)
+       amigaos | amigados)

                basic_machine=m68k-cbm
                basic_machine=m68k-cbm

-               os=-amigados
+               os=-amigaos

                ;;
        amigaunix | amix)
                basic_machine=m68k-cbm
                ;;
        amigaunix | amix)
                basic_machine=m68k-cbm


@@ -207,10 +313,14 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-sysv
                ;;
                basic_machine=m68k-apollo
                os=-sysv
                ;;

-       apollo68bsd)                                    # CYGNUS LOCAL
+       apollo68bsd)

                basic_machine=m68k-apollo
                os=-bsd
                ;;
                basic_machine=m68k-apollo
                os=-bsd
                ;;

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

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


@@ -243,9 +353,16 @@ 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
                ;;

+       cris | cris-* | etrax*)
+               basic_machine=cris-axis
+               ;;

        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;


@@ -279,7 +396,7 @@ case $basic_machine in
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;

-       es1800 | OSE68k | ose68k | ose | OSE)           # CYGNUS LOCAL
+       es1800 | OSE68k | ose68k | ose | OSE)

                basic_machine=m68k-ericsson
                os=-ose
                ;;
                basic_machine=m68k-ericsson
                os=-ose
                ;;


@@ -297,19 +414,15 @@ case $basic_machine in
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
                ;;
                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
                ;;

-       h8300xray)                                      # CYGNUS LOCAL
+       h8300xray)

                basic_machine=h8300-hitachi
                os=-xray
                ;;
                basic_machine=h8300-hitachi
                os=-xray
                ;;

-       h8500hms)                                       # CYGNUS LOCAL
+       h8500hms)

                basic_machine=h8500-hitachi
                os=-hms
                ;;
                basic_machine=h8500-hitachi
                os=-hms
                ;;


@@ -328,85 +441,83 @@ 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
-                ;;
+       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
                ;;
        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])
                basic_machine=hppa1.0-hp
                ;;
                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;

+       hppa-next)
+               os=-nextstep3
+               ;;

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

+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf
+               ;;

        i370-ibm* | ibm*)
                basic_machine=i370-ibm
        i370-ibm* | ibm*)
                basic_machine=i370-ibm

-               os=-mvs

                ;;
 # 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[345]86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+       i[34567]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[34567]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[34567]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[34567]86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

                os=-solaris2
                ;;
                os=-solaris2
                ;;

-       i386mach)                                       # CYGNUS LOCAL
+       i386mach)

                basic_machine=i386-mach
                os=-mach
                ;;
                basic_machine=i386-mach
                os=-mach
                ;;

-       i386-vsta | vsta)                               # CYGNUS LOCAL
+       i386-vsta | vsta)

                basic_machine=i386-unknown
                os=-vsta
                ;;
                basic_machine=i386-unknown
                os=-vsta
                ;;

-       i386-go32 | go32)                               # CYGNUS LOCAL
+       i386-go32 | go32)

                basic_machine=i386-unknown
                os=-go32
                ;;
                basic_machine=i386-unknown
                os=-go32
                ;;

-       i386-linux* | linux)                            # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-linux
-               ;;
-       i386-linux*coff | linuxcoff)                    # CYGNUS LOCAL
+       i386-mingw32 | mingw32)

                basic_machine=i386-unknown
                basic_machine=i386-unknown

-               os=-linuxcoff
+               os=-mingw32

                ;;
                ;;

-       i386-linux*elf | linuxelf)                      # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-linuxelf
-               ;;
-       iris | iris4d | \
-       iris3 | iris4)                                  # CYGNUS LOCAL
+       iris | iris4d)

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


@@ -434,28 +545,52 @@ case $basic_machine in
        miniframe)
                basic_machine=m68000-convergent
                ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;

+       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+       mipsel*-linux*)
+               basic_machine=mipsel-unknown
+               os=-linux-gnu
+               ;;
+       mips*-linux*)
+               basic_machine=mips-unknown
+               os=-linux-gnu
+               ;;

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

-       monitor)                                         # CYGNUS LOCAL
+       mmix*)
+               basic_machine=mmix-knuth
+               os=-mmixware
+               ;;
+       monitor)

                basic_machine=m68k-rom68k
                os=-coff
                ;;
                basic_machine=m68k-rom68k
                os=-coff
                ;;

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

                os=-msdos
                ;;
                os=-msdos
                ;;

+       mvs)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;

        ncr3000)
                basic_machine=i486-ncr
                os=-sysv4
                ;;
        netbsd386)
        ncr3000)
                basic_machine=i486-ncr
                os=-sysv4
                ;;
        netbsd386)

-               basic_machine=i386-unknown              # CYGNUS LOCAL
+               basic_machine=i386-unknown

                os=-netbsd
                ;;
                os=-netbsd
                ;;

+       netwinder)
+               basic_machine=armv4l-rebel
+               os=-linux
+               ;;

        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos
        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos


@@ -468,7 +603,7 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
                basic_machine=mips-sony
                os=-newsos
                ;;

-       necv70)                                         # CYGNUS LOCAL
+       necv70)

                basic_machine=v70-nec
                os=-sysv
                ;;
                basic_machine=v70-nec
                os=-sysv
                ;;


@@ -497,14 +632,25 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-nindy
                ;;
                basic_machine=i960-intel
                os=-nindy
                ;;

+       mon960)
+               basic_machine=i960-intel
+               os=-mon960
+               ;;

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

-       OSE68000 | ose68000)                            # CYGNUS LOCAL
+       nsr-tandem)
+               basic_machine=nsr-tandem
+               ;;
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       OSE68000 | ose68000)

                basic_machine=m68000-ericsson
                os=-ose
                ;;
                basic_machine=m68000-ericsson
                os=-ose
                ;;

-       os68k)                                          # CYGNUS LOCAL
+       os68k)

                basic_machine=m68k-none
                os=-os68k
                ;;
                basic_machine=m68k-none
                os=-os68k
                ;;


@@ -525,25 +671,53 @@ case $basic_machine in
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;

-       pentium-*)
-               # We will change tis to say i586 once there has been
-               # time for various packages to start to recognize that.
-               basic_machine=i486-`echo $basic_machine | sed 's/^[^-]*-//'`
+       pentium | p5 | k5 | k6 | nexen)
+               basic_machine=i586-pc
+               ;;
+       pentiumpro | p6 | 6x86 | athlon)
+               basic_machine=i686-pc
+               ;;
+       pentiumii | pentium2)
+               basic_machine=i786-pc
+               ;;
+       pentium-* | p5-* | k5-* | k6-* | nexen-*)
+               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumpro-* | p6-* | 6x86-* | athlon-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumii-* | pentium2-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`

                ;;
        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
+       rom68k)

                basic_machine=m68k-rom68k
                os=-coff
                ;;
                basic_machine=m68k-rom68k
                os=-coff
                ;;

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

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

-       sa29200)                                        # CYGNUS LOCAL
+       sa29200)

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


@@ -554,24 +728,10 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
                basic_machine=sh-hitachi
                os=-hms
                ;;

-       sparclite-wrs)                                  # CYGNUS LOCAL
+       sparclite-wrs)

                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


@@ -579,10 +739,10 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
        spur)
                basic_machine=spur-unknown
                ;;

-       st2000)                                         # CYGNUS LOCAL
+       st2000)

                basic_machine=m68k-tandem
                ;;
                basic_machine=m68k-tandem
                ;;

-       stratus)                                        # CYGNUS LOCAL
+       stratus)

                basic_machine=i860-stratus
                os=-sysv4
                ;;
                basic_machine=i860-stratus
                os=-sysv4
                ;;


@@ -613,7 +773,7 @@ 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
                ;;


@@ -626,14 +786,32 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;

+       sv1)
+               basic_machine=sv1-cray
+               os=-unicos
+               ;;

        symmetry)
                basic_machine=i386-sequent
                os=-dynix
                ;;
        symmetry)
                basic_machine=i386-sequent
                os=-dynix
                ;;

+       t3e)
+               basic_machine=t3e-cray
+               os=-unicos
+               ;;
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff
+               ;;
+       tx39)
+               basic_machine=mipstx39-unknown
+               ;;
+       tx39el)
+               basic_machine=mipstx39el-unknown
+               ;;

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


@@ -641,10 +819,6 @@ 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)
                basic_machine=v810-nec
                os=-none
        v810 | necv810)
                basic_machine=v810-nec
                os=-none


@@ -657,6 +831,9 @@ case $basic_machine in
                basic_machine=vax-dec
                os=-vms
                ;;
                basic_machine=vax-dec
                os=-vms
                ;;

+       vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;

        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks


@@ -665,6 +842,18 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
                basic_machine=m68k-wrs
                os=-vxworks
                ;;

+       vxworks29k)
+               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
        xmp)
                basic_machine=xmp-cray
                os=-unicos


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

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

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


@@ -683,17 +872,21 @@ 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)

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

-       op50n)                                          # CYGNUS LOCAL
+       op50n)

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

-       op60c)                                          # CYGNUS LOCAL
+       op60c)

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

-               basic_machine=mips-mips
+               if [ x$os = x-linux-gnu ]; then
+                       basic_machine=mips-unknown
+               else
+                       basic_machine=mips-mips
+               fi

                ;;
        romp)
                basic_machine=romp-ibm
                ;;
        romp)
                basic_machine=romp-ibm


@@ -704,10 +897,16 @@ 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
                ;;

-       sparc)
+       sh3 | sh4)
+               base_machine=sh-unknown
+               ;;
+       sparc | sparcv9)

                basic_machine=sparc-sun
                ;;
         cydra)
                basic_machine=sparc-sun
                ;;
         cydra)


@@ -719,14 +918,16 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
        orion105)
                basic_machine=clipper-highlevel
                ;;

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

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

-       mpw)                                            # CYGNUS LOCAL
-               basic_machine=m68k-apple
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       c4x*)
+               basic_machine=c4x-none
+               os=-coff

                ;;
                ;;

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


@@ -750,6 +951,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|'`


@@ -757,23 +960,57 @@ case $os in
        -solaris)
                os=-solaris2
                ;;
        -solaris)
                os=-solaris2
                ;;

+       -svr4*)
+               os=-sysv4
+               ;;
+       -unixware*)
+               os=-sysv4.2uw
+               ;;
+       -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[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* | -newsos* | -unicos* | -aos* \
-             | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-             | -ptx* \
-             | -go32 | -vsta | -sim | -es1800* | -udi | -hms* | -xray | -hds* \
-             | -os68k* | -none* | -v88r* | -coff \
-             | -abug | -ecoff* | -netware* | -proelf | -os9* )
-                               # The last three lines above are CYGNUS LOCAL
+             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+             | -aos* \
+             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+             | -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* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -openstep* | -oskit*)
+       # Remember, each alternative MUST END IN *, to match a version number.
+               ;;
+       -qnx*)
+               case $basic_machine in
+                   x86-* | i[34567]86-*)
+                       ;;
+                   *)
+                       os=-nto$os
+                       ;;
+               esac
+               ;;
+       -nto*)
+               os=-nto-qnx
+               ;;
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+               ;;
+       -mac*)
+               os=`echo $os | sed -e 's|mac|macos|'`
+               ;;
+       -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|'`


@@ -781,6 +1018,12 @@ case $os in
        -sunos6*)
                os=`echo $os | sed -e 's|sunos6|solaris3|'`
                ;;
        -sunos6*)
                os=`echo $os | sed -e 's|sunos6|solaris3|'`
                ;;

+       -opened*)
+               os=-openedition
+               ;;
+       -wince*)
+               os=-wince
+               ;;

        -osfrose*)
                os=-osfrose
                ;;
        -osfrose*)
                os=-osfrose
                ;;


@@ -796,12 +1039,25 @@ case $os in
        -acis*)
                os=-aos
                ;;
        -acis*)
                os=-aos
                ;;

-       -386bsd)                                        # CYGNUS LOCAL
+       -386bsd)

                os=-bsd
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;
                os=-bsd
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;

+       -ns2 )
+               os=-nextstep2
+               ;;
+       -nsk)
+               os=-nsk
+               ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+               os=`echo $os | sed -e 's|sinix|sysv|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;

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


@@ -811,9 +1067,6 @@ case $os in
        -svr4)
                os=-sysv4
                ;;
        -svr4)
                os=-sysv4
                ;;

-       -unixware)                      # CYGNUS LOCAL
-               os=-sysv4
-               ;;

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


@@ -823,15 +1076,18 @@ case $os in
        # This must come after -sysvr4.
        -sysv*)
                ;;
        # This must come after -sysvr4.
        -sysv*)
                ;;

-       -ose*)                                          # CYGNUS LOCAL
+       -ose*)

                os=-ose
                ;;
                os=-ose
                ;;

-       -es1800*)                                       # CYGNUS LOCAL
+       -es1800*)

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

+        -*mint | -*MiNT)
+               os=-mint
+               ;;

        -none)
                ;;
        *)
        -none)
                ;;
        *)


@@ -857,9 +1113,21 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
        *-acorn)
                os=-riscix1.2
                ;;

+       arm*-rebel)
+               os=-linux
+               ;;
+       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
                ;;


@@ -875,22 +1143,28 @@ case $basic_machine in
        mips*-cisco)
                os=-elf
                ;;
        mips*-cisco)
                os=-elf
                ;;

+       mips*-*)
+               os=-elf
+               ;;

        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        sparc-* | *-sun)
                os=-sunos4.1.1
                ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        sparc-* | *-sun)
                os=-sunos4.1.1
                ;;

+       *-be)
+               os=-beos
+               ;;

        *-ibm)
                os=-aix
                ;;
        *-ibm)
                os=-aix
                ;;

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

                os=-proelf
                ;;
                os=-proelf
                ;;

-       *-winbond)                                      # CYGNUS LOCAL
+       *-winbond)

                os=-proelf
                ;;
                os=-proelf
                ;;

-       *-oki)                                          # CYGNUS LOCAL
+       *-oki)

                os=-proelf
                ;;
        *-hp)
                os=-proelf
                ;;
        *-hp)


@@ -903,7 +1177,7 @@ case $basic_machine in
                os=-sysv
                ;;
        *-cbm)
                os=-sysv
                ;;
        *-cbm)

-               os=-amigados
+               os=-amigaos

                ;;
        *-dg)
                os=-dgux
                ;;
        *-dg)
                os=-dgux


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

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

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


@@ -944,20 +1221,27 @@ case $basic_machine in
         *-sgi)
                os=-irix
                ;;
         *-sgi)
                os=-irix
                ;;

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

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

-       *-rom68k)                                       # CYGNUS LOCAL
+       f301-fujitsu)
+               os=-uxpv
+               ;;
+       *-rom68k)

                os=-coff
                ;;
                os=-coff
                ;;

-       *-*bug)                                         # CYGNUS LOCAL
+       *-*bug)

                os=-coff
                ;;
                os=-coff
                ;;

-## start-sanitize-mpw
-       *-apple)                                        # CYGNUS LOCAL
-               os=-mpw
+       *-apple)
+               os=-macos
+               ;;
+       *-atari*)
+               os=-mint

                ;;
                ;;

-## end-sanitize-mpw

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


@@ -976,18 +1260,18 @@ case $basic_machine in
                        -sunos*)
                                vendor=sun
                                ;;
                        -sunos*)
                                vendor=sun
                                ;;

-                       -bosx*)                 # CYGNUS LOCAL
-                               vendor=bull
-                               ;;
-                       -lynxos*)
-                               vendor=lynx
-                               ;;

                        -aix*)
                                vendor=ibm
                                ;;
                        -aix*)
                                vendor=ibm
                                ;;

+                       -beos*)
+                               vendor=be
+                               ;;

                        -hpux*)
                                vendor=hp
                                ;;
                        -hpux*)
                                vendor=hp
                                ;;

+                       -mpeix*)
+                               vendor=hp
+                               ;;

                        -hiux*)
                                vendor=hitachi
                                ;;
                        -hiux*)
                                vendor=hitachi
                                ;;


@@ -1003,26 +1287,38 @@ case $basic_machine in
                        -genix*)
                                vendor=ns
                                ;;
                        -genix*)
                                vendor=ns
                                ;;

-                       -mvs*)
+                       -mvs* | -opened*)

                                vendor=ibm
                                ;;
                        -ptx*)
                                vendor=sequent
                                ;;
                                vendor=ibm
                                ;;
                        -ptx*)
                                vendor=sequent
                                ;;

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

                                ;;
                                ;;

-                       -hms*)                          # CYGNUS LOCAL
+                       -hms*)

                                vendor=hitachi
                                ;;
                                vendor=hitachi
                                ;;

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

                                vendor=apple
                                ;;
                                vendor=apple
                                ;;

-## end-sanitize-mpw
+                       -*mint | -*MiNT)
+                               vendor=atari
+                               ;;

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

+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "version='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End: