Prevent re-read of instruction from wrong address.

[binutils.git] / config.sub

diff --git a/config.sub b/config.sub
index 42cc73aeff94c855f8d6a62ff37b4f1a35297b0a..f8d46e4efcae9398d221d6b9904a74243666865d 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 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-11-02'

 
 

-#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,189 +47,293 @@
 # 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

-# it is wrong to echo any other type of specification
+# 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 ]
-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* | storm-chaos*)
+    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

 
 

-# Lets recognize common machines as not being OS so that things like
-# config.sub decstation-3100 work.
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.

 case $os in
 case $os in

+       -sun*os*)
+               # Prevent following clause from handling this invalid input.
+               ;;

        -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
        -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
        -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
        -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \

-       -unicom* | -ibm* | -next* | -hp | -isi* | -apollo | -altos* | \
-       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | \
+       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

-       -harris | -dolphin | \
-       -sim)                                           # CYGNUS LOCAL
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+       -apple | -axis)

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

-       -scout)                                         # CYGNUS LOCAL
+       -sim | -cisco | -oki | -wec | -winbond)
+               os=
+               basic_machine=$1
+               ;;
+       -scout)
+               ;;
+       -wrs)
+               os=-vxworks
+               basic_machine=$1
+               ;;
+       -chorusos*)
+               os=-chorusos
+               basic_machine=$1
+               ;;
+       -chorusrdb)
+               os=-chorusrdb
+               basic_machine=$1
+               ;;
+       -hiux*)
+               os=-hiuxwe2
+               ;;
+       -sco5)
+               os=-sco3.2v5
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco4)
+               os=-sco3.2v4
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco3.2.[4-9]*)
+               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+               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.
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

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

-               basic_machine=i386-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
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -clix*)
+               basic_machine=clipper-intergraph

                ;;
        -isc*)
                ;;
        -isc*)

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

                ;;
                ;;

-       -OSE68k | -ose68k | -OSE | -ose | -es1800)      # CYGNUS LOCAL
-               os=-ose
-               basic_machine=m68k-ericsson
+       -lynx*)
+               os=-lynxos

                ;;
                ;;

-       -OSE68000 | -ose68000)                          # CYGNUS LOCAL
-               os=-ose
-               basic_machine=m68000-ericsson
+       -ptx*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`

                ;;
                ;;

-# start-sanitize-v9
-       -32)                                            # CYGNUS LOCAL
-               basic_machine=sparc64-hal
-               os=-hal32
+       -windowsnt*)
+               os=`echo $os | sed -e 's/windowsnt/winnt/'`

                ;;
                ;;

-       -64)                                            # CYGNUS LOCAL
-               basic_machine=sparc64-hal
-               os=-hal64
+       -psos*)
+               os=-psos

                ;;
                ;;

-       -v7)                                            # CYGNUS LOCAL
-               basic_machine=sparc64-sun
-               os=-v7
+       -mint | -mint[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint

                ;;
                ;;

-# end-sanitize-v9      

 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in

-       # Recognize the basic CPU types with without company name.
+       # Recognize the basic CPU types without company name.

        # Some are omitted here because they have special meanings below.
        # 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 | h8300 | hppa1.0 | hppa1.1 \
-               | alpha | we32k \
-               | m680[01234]0 | m683?2 | z8k | v70)    # CYGNUS LOCAL
+       tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+               | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+               | pyramid | mn10200 | mn10300 | tron | a29k \
+               | 580 | i960 | h8300 \
+               | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+               | 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
                ;;

-       # Recognize the basic CPU types with with company name.
-       vax-* | tahoe-* | i[34]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-             | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-             | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-             | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* \
-             | m680[01234]0-* | m683?2-* | z8k-*)      # CYGNUS LOCAL
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
-# start-sanitize-v9
-       sparc64-*) ;;                                   # CYGNUS LOCAL
-       hal-32 | hal32)                                 # CYGNUS LOCAL
-               basic_machine=sparc64-hal
-               os=-hal32
-               ;;
-       hal-64 | hal64)                                 # CYGNUS LOCAL
-               basic_machine=sparc64-hal
-               os=-hal64
-               ;;
-       sparc64)                                        # CYGNUS LOCAL
-               basic_machine=sparc64-sun
-               os=-v9
+       m6811 | m68hc11 | m6812 | m68hc12)
+               # Motorola 68HC11/12.
+               basic_machine=$basic_machine-unknown
+               os=-none

                ;;
                ;;

-       sparc64-v7 | sparc64v7)                         # CYGNUS LOCAL
-               basic_machine=sparc64-sun
-               os=-v7
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)

                ;;
                ;;

-# end-sanitize-v9

 
 

-       vaxv)
-               basic_machine=vax-dec
-               os=-sysv
-               ;;
-       vms)
-               basic_machine=vax-dec
-               os=-vms
+       # 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 | x86_64)
+         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

                ;;
                ;;

-       i386mach)                                       # CYGNUS LOCAL
-               basic_machine=i386-mach
-               os=-mach
+       # Recognize the basic CPU types with company name.
+       # FIXME: clean up the formatting here.
+       vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+             | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+             | xmp-* | ymp-* \
+             | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+             | 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-* \
+             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+             | mipstx39-* | mipstx39el-* | mcore-* \
+             | f301-* | s390-* | sv1-* | t3e-* \
+             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+             | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+             | bs2000-* | tic54x-* | c54x-* | x86_64-*)

                ;;
                ;;

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

                basic_machine=i386-unknown
                basic_machine=i386-unknown

-               os=-sysv32
+               os=-bsd

                ;;
                ;;

-       i386-sco* | i386sco | sco)
-               basic_machine=i386-unknown
-               os=-sco3.2v2
+       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+               basic_machine=m68000-att

                ;;
                ;;

-       go32 | i386-go32)                               # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-go32
+       3b*)
+               basic_machine=we32k-att

                ;;
                ;;

-       i386-isc* | isc)
-               basic_machine=i386-unknown
-               os=-isc
+       a29khif)
+               basic_machine=a29k-amd
+               os=-udi

                ;;
                ;;

-       i386-linux* | linux)                            # CYGNUS LOCAL
-               basic_machine=i386-unknown
-               os=-linux
+       adobe68k)
+               basic_machine=m68010-adobe
+               os=-scout

                ;;
                ;;

-       i486v32)
-               basic_machine=i486-unknown
-               os=-sysv32
+       alliant | fx80)
+               basic_machine=fx80-alliant

                ;;
                ;;

-       i486-sco* | i486sco | sco)
-               basic_machine=i486-unknown
-               os=-sco3.2v2
+       altos | altos3068)
+               basic_machine=m68k-altos

                ;;
                ;;

-       i486-isc* | isc)
-               basic_machine=i486-unknown
-               os=-isc
+       am29k)
+               basic_machine=a29k-none
+               os=-bsd

                ;;
                ;;

-       i386v4*)
-               basic_machine=i386-unknown
-               os=-sysv4
+       amdahl)
+               basic_machine=580-amdahl
+               os=-sysv

                ;;
                ;;

-       i486v4*)
-               basic_machine=i486-unknown
-               os=-sysv4
+       amiga | amiga-*)
+               basic_machine=m68k-unknown

                ;;
                ;;

-       i386v)
-               basic_machine=i386-unknown
-               os=-sysv
+       amigaos | amigados)
+               basic_machine=m68k-unknown
+               os=-amigaos
+               ;;
+       amigaunix | amix)
+               basic_machine=m68k-unknown
+               os=-sysv4

                ;;
                ;;

-       i486v)
-               basic_machine=i486-unknown
+       apollo68)
+               basic_machine=m68k-apollo

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

-       386bsd)                                         # CYGNUS LOCAL
-               basic_machine=i386-unknown
+       apollo68bsd)
+               basic_machine=m68k-apollo

                os=-bsd
                ;;
                os=-bsd
                ;;

-       spur)
-               basic_machine=spur-unknown
+       aux)
+               basic_machine=m68k-apple
+               os=-aux

                ;;
                ;;

-       alliant | fx80)
-               basic_machine=fx80-alliant
+       balance)
+               basic_machine=ns32k-sequent
+               os=-dynix

                ;;
        convex-c1)
                basic_machine=c1-convex
                ;;
        convex-c1)
                basic_machine=c1-convex


@@ -240,301 +355,499 @@ case $basic_machine in
                basic_machine=c38-convex
                os=-bsd
                ;;
                basic_machine=c38-convex
                os=-bsd
                ;;

-       m88k-omron*)
-               basic_machine=m88k-omron
+       cray | ymp)
+               basic_machine=ymp-cray
+               os=-unicos

                ;;
                ;;

-       merlin)
-               basic_machine=ns32k-utek
-               os=-sysv
+       cray2)
+               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
+               ;;
+       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+               basic_machine=mips-dec
+               ;;
+       delta | 3300 | motorola-3300 | motorola-delta \
+             | 3300-motorola | delta-motorola)
+               basic_machine=m68k-motorola
+               ;;
+       delta88)
+               basic_machine=m88k-motorola
+               os=-sysv3
+               ;;
+       dpx20 | dpx20-*)
+               basic_machine=rs6000-bull
+               os=-bosx
+               ;;
+       dpx2* | dpx2*-bull)
+               basic_machine=m68k-bull
+               os=-sysv3
+               ;;
+       ebmon29k)
+               basic_machine=a29k-amd
+               os=-ebmon
+               ;;

        elxsi)
                basic_machine=elxsi-elxsi
                os=-bsd
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore
        elxsi)
                basic_machine=elxsi-elxsi
                os=-bsd
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore

-               os=-bsd
+               ;;
+       es1800 | OSE68k | ose68k | ose | OSE)
+               basic_machine=m68k-ericsson
+               os=-ose
+               ;;
+       fx2800)
+               basic_machine=i860-alliant

                ;;
        genix)
                basic_machine=ns32k-ns
                ;;
                ;;
        genix)
                basic_machine=ns32k-ns
                ;;

-       iris | iris4d | \
-       iris3 | iris4)                                  # CYGNUS LOCAL
-               basic_machine=mips-sgi
-               case $os in
-                   -irix*)
-                       ;;
-                   *)
-                       os=-irix4
-                       ;;
-               esac
+       gmicro)
+               basic_machine=tron-gmicro
+               os=-sysv

                ;;
                ;;

-       news | news700 | news800 | news900)
-               basic_machine=m68k-sony
-               os=-newsos
+       h3050r* | hiux*)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2

                ;;
                ;;

-       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-               basic_machine=m68000-att
+       h8300hms)
+               basic_machine=h8300-hitachi
+               os=-hms

                ;;
                ;;

-       3b*)
-               basic_machine=we32k-att
+       h8300xray)
+               basic_machine=h8300-hitachi
+               os=-xray

                ;;
                ;;

-       delta | 3300 | motorola-3300 | motorola-delta \
-             | 3300-motorola | delta-motorola)
-               basic_machine=m68k-motorola
+       h8500hms)
+               basic_machine=h8500-hitachi
+               os=-hms

                ;;
                ;;

-       balance)
-               basic_machine=ns32k-sequent
-               os=-dynix
+       harris)
+               basic_machine=m88k-harris
+               os=-sysv3

                ;;
                ;;

-        pc532)
-               basic_machine=ns32k-pc532
+       hp300-*)
+               basic_machine=m68k-hp

                ;;
                ;;

-       symmetry)
-               basic_machine=i386-sequent
-               os=-dynix
+       hp300bsd)
+               basic_machine=m68k-hp
+               os=-bsd

                ;;
                ;;

-       sun2)
-               basic_machine=m68000-sun
+       hp300hpux)
+               basic_machine=m68k-hp
+               os=-hpux

                ;;
                ;;

-       sun2os3)
-               basic_machine=m68000-sun
-               os=-sunos3
+       hp3k9[0-9][0-9] | hp9[0-9][0-9])
+               basic_machine=hppa1.0-hp

                ;;
                ;;

-       sun2os4)
-               basic_machine=m68000-sun
-               os=-sunos4
+       hp9k2[0-9][0-9] | hp9k31[0-9])
+               basic_machine=m68000-hp

                ;;
                ;;

-       sun3os3)
-               basic_machine=m68k-sun
-               os=-sunos3
+       hp9k3[2-9][0-9])
+               basic_machine=m68k-hp

                ;;
                ;;

-       sun3os4)
-               basic_machine=m68k-sun
-               os=-sunos4
+       hp9k6[0-9][0-9] | hp6[0-9][0-9])
+               basic_machine=hppa1.0-hp

                ;;
                ;;

-       sun4os3)
-               basic_machine=sparc-sun
-               os=-sunos3
+       hp9k7[0-79][0-9] | hp7[0-79][0-9])
+               basic_machine=hppa1.1-hp

                ;;
                ;;

-       sun4os4)
-               basic_machine=sparc-sun
-               os=-sunos4
+       hp9k78[0-9] | hp78[0-9])
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp

                ;;
                ;;

-       sun4sol2)                                       # CYGNUS LOCAL
-               basic_machine=sparc-sun
-               os=-solaris2
+       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

                ;;
                ;;

-       z8ksim)                                         # CYGNUS LOCAL
-               basic_machine=z8k-unknown
-               os=-sim
+       hp9k8[0-9][13679] | hp8[0-9][13679])
+               basic_machine=hppa1.1-hp

                ;;
                ;;

-       sun3)
-               basic_machine=m68k-sun
+       hp9k8[0-9][0-9] | hp8[0-9][0-9])
+               basic_machine=hppa1.0-hp

                ;;
                ;;

-       sun4)
-               basic_machine=sparc-sun
+       hppa-next)
+               os=-nextstep3

                ;;
                ;;

-       msdos)                                          # CYGNUS LOCAL
-               basic_machine=i386-unknown      
-               os=-msdos
+       hppaosf)
+               basic_machine=hppa1.1-hp
+               os=-osf

                ;;
                ;;

-       pbd)
-               basic_machine=sparc-tti
+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf

                ;;
                ;;

-       pbb)
-               basic_machine=m68k-tti
+       i370-ibm* | ibm*)
+               basic_machine=i370-ibm

                ;;
                ;;

-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+       i[34567]86v32)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv32

                ;;
                ;;

-       ps2)
-               basic_machine=i386-ibm
+       i[34567]86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv4

                ;;
                ;;

-       fx2800)
-               basic_machine=i860-alliant
+       i[34567]86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv

                ;;
                ;;

-       next)
-               basic_machine=m68k-next
-               os=-bsd
+       i[34567]86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-solaris2
+               ;;
+       i386mach)
+               basic_machine=i386-mach
+               os=-mach

                ;;
                ;;

-       amiga)
-               basic_machine=m68k-cbm
+       i386-vsta | vsta)
+               basic_machine=i386-unknown
+               os=-vsta

                ;;
                ;;

-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
+       i386-go32 | go32)
+               basic_machine=i386-unknown
+               os=-go32

                ;;
                ;;

-       hp9k31[0-9] | hp9k2[0-9][0-9])
-               basic_machine=m68000-hp
+       i386-mingw32 | mingw32)
+               basic_machine=i386-unknown
+               os=-mingw32

                ;;
                ;;

-       hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-               basic_machine=hppa1.1-hp
+       i[34567]86-pw32 | pw32)
+               basic_machine=i586-unknown
+               os=-pw32

                ;;
                ;;

-       hp9k8[0-9][0-9] | hp8[0-9][0-9])
-               basic_machine=hppa1.0-hp
+       iris | iris4d)
+               basic_machine=mips-sgi
+               case $os in
+                   -irix*)
+                       ;;
+                   *)
+                       os=-irix4
+                       ;;
+               esac

                ;;
        isi68 | isi)
                basic_machine=m68k-isi
                os=-sysv
                ;;
                ;;
        isi68 | isi)
                basic_machine=m68k-isi
                os=-sysv
                ;;

-       apollo68)
-               basic_machine=m68k-apollo
-               os=-sysv
+       m88k-omron*)
+               basic_machine=m88k-omron

                ;;
                ;;

-       apollo68bsd)                                    # CYGNUS LOCAL
-               basic_machine=m68k-apollo
-               os=-bsd
+       magnum | m3230)
+               basic_machine=mips-mips
+               os=-sysv

                ;;
                ;;

-       altos | altos3068)
-               basic_machine=m68k-altos
+       merlin)
+               basic_machine=ns32k-utek
+               os=-sysv

                ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
                ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;

-       tower | tower-32)
-               basic_machine=m68k-ncr
+       *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
+               ;;
+       mmix*)
+               basic_machine=mmix-knuth
+               os=-mmixware
+               ;;
+       monitor)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       msdos)
+               basic_machine=i386-unknown
+               os=-msdos
+               ;;
+       mvs)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;
+       ncr3000)
+               basic_machine=i486-ncr
+               os=-sysv4
+               ;;
+       netbsd386)
+               basic_machine=i386-unknown
+               os=-netbsd
+               ;;
+       netwinder)
+               basic_machine=armv4l-rebel
+               os=-linux
+               ;;
+       news | news700 | news800 | news900)
+               basic_machine=m68k-sony
+               os=-newsos
+               ;;
+       news1000)
+               basic_machine=m68030-sony
+               os=-newsos

                ;;
        news-3600 | risc-news)
                basic_machine=mips-sony
                os=-newsos
                ;;
                ;;
        news-3600 | risc-news)
                basic_machine=mips-sony
                os=-newsos
                ;;

-       st2000)                                         # CYGNUS LOCAL
-               basic_machine=m68k-tandem
+       necv70)
+               basic_machine=v70-nec
+               os=-sysv
+               ;;
+       next | m*-next )
+               basic_machine=m68k-next
+               case $os in
+                   -nextstep* )
+                       ;;
+                   -ns2*)
+                     os=-nextstep2
+                       ;;
+                   *)
+                     os=-nextstep3
+                       ;;
+               esac
+               ;;
+       nh3000)
+               basic_machine=m68k-harris
+               os=-cxux
+               ;;
+       nh[45]000)
+               basic_machine=m88k-harris
+               os=-cxux
+               ;;
+       nindy960)
+               basic_machine=i960-intel
+               os=-nindy
+               ;;
+       mon960)
+               basic_machine=i960-intel
+               os=-mon960
+               ;;
+       np1)
+               basic_machine=np1-gould
+               ;;
+       nsr-tandem)
+               basic_machine=nsr-tandem
+               ;;
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       OSE68000 | ose68000)
+               basic_machine=m68000-ericsson
+               os=-ose
+               ;;
+       os68k)
+               basic_machine=m68k-none
+               os=-os68k
+               ;;
+       pa-hitachi)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       paragon)
+               basic_machine=i860-intel
+               os=-osf
+               ;;
+       pbd)
+               basic_machine=sparc-tti
+               ;;
+       pbb)
+               basic_machine=m68k-tti
+               ;;
+        pc532 | pc532-*)
+               basic_machine=ns32k-pc532
+               ;;
+       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
+               ;;
+       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/^[^-]*-//'`

                ;;
                ;;

-       decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
-               basic_machine=mips-dec
+       ps2)
+               basic_machine=i386-ibm

                ;;
                ;;

-       magnum | m3230)
-               basic_machine=mips-mips
-               os=-sysv
+       rom68k)
+               basic_machine=m68k-rom68k
+               os=-coff

                ;;
                ;;

-       gmicro)
-               basic_machine=tron-gmicro
-               os=-sysv
+       rm[46]00)
+               basic_machine=mips-siemens

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

-       am29k)
-               basic_machine=a29k-none
-               os=-bsd
-               ;;
-       amdahl)
-               basic_machine=580-amdahl
-               os=-sysv
+       sa29200)
+               basic_machine=a29k-amd
+               os=-udi

                ;;
                ;;

-       amigados)
-               basic_machine=m68k-cbm
-               os=-amigados
+       sequent)
+               basic_machine=i386-sequent

                ;;
                ;;

-       amigaunix | amix)
-               basic_machine=m68k-cbm
-               os=-sysv4
+       sh)
+               basic_machine=sh-hitachi
+               os=-hms

                ;;
                ;;

-       stratus)                                        # CYGNUS LOCAL
-               basic_machine=i860-stratus
-               os=-sysv4
+       sparclite-wrs)
+               basic_machine=sparclite-wrs
+               os=-vxworks

                ;;
                ;;

-       cray | ymp)
-               basic_machine=ymp-cray
-               os=-unicos
+       sps7)
+               basic_machine=m68k-bull
+               os=-sysv2

                ;;
                ;;

-       cray2)
-               basic_machine=cray2-cray
-               os=-unicos
+       spur)
+               basic_machine=spur-unknown

                ;;
                ;;

-       xmp)
-               basic_machine=xmp-cray
-               os=-unicos
+       st2000)
+               basic_machine=m68k-tandem

                ;;
                ;;

-       delta88)
-               basic_machine=m88k-motorola
-               os=-m88kbcs
+       stratus)
+               basic_machine=i860-stratus
+               os=-sysv4

                ;;
                ;;

-       dpx2)
-               basic_machine=m68k-bull
-               os=-sysv
+       sun2)
+               basic_machine=m68000-sun

                ;;
                ;;

-       ebmon29k)
-               basic_machine=a29k-amd
-               os=-ebmon
+       sun2os3)
+               basic_machine=m68000-sun
+               os=-sunos3

                ;;
                ;;

-
-       h8300hms)                                       # CYGNUS LOCAL
-               basic_machine=h8300-hitachi
-               os=-hms
+       sun2os4)
+               basic_machine=m68000-sun
+               os=-sunos4

                ;;
                ;;

-       h8300xray)                                      # CYGNUS LOCAL
-               basic_machine=h8300-hitachi
-               os=-xray
+       sun3os3)
+               basic_machine=m68k-sun
+               os=-sunos3

                ;;
                ;;

-       h8300hds)
-               basic_machine=h8300-hitachi
-               os=-hds
+       sun3os4)
+               basic_machine=m68k-sun
+               os=-sunos4

                ;;
                ;;

-       udi29k)                                         # CYGNUS LOCAL
-               basic_machine=a29k-amd
-               os=-udi
+       sun4os3)
+               basic_machine=sparc-sun
+               os=-sunos3

                ;;
                ;;

-       a29khif)                                        # CYGNUS LOCAL
-               basic_machine=a29k-amd
-               os=-udi
+       sun4os4)
+               basic_machine=sparc-sun
+               os=-sunos4

                ;;
                ;;

-       sa29200)                                        # CYGNUS LOCAL
-               basic_machine=a29k-amd
-               os=-udi
+       sun4sol2)
+               basic_machine=sparc-sun
+               os=-solaris2

                ;;
                ;;

-       harris)
-               basic_machine=m88k-harris
-               os=-m88kbcs
+       sun3 | sun3-*)
+               basic_machine=m68k-sun

                ;;
                ;;

-       hp300bsd)
-               basic_machine=m68k-hp
-               os=-bsd
+       sun4)
+               basic_machine=sparc-sun

                ;;
                ;;

-       hp300hpux)
-               basic_machine=m68k-hp
-               os=-hpux
+       sun386 | sun386i | roadrunner)
+               basic_machine=i386-sun

                ;;
                ;;

-       hp9k2[0-9][0-9] | hp9k31[0-9])
-               basic_machine=m68000-hp
-               os=-hpux
+       sv1)
+               basic_machine=sv1-cray
+               os=-unicos

                ;;
                ;;

-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
-               os=-hpux
+       symmetry)
+               basic_machine=i386-sequent
+               os=-dynix

                ;;
                ;;

-       ncr3000)
-               basic_machine=i486-ncr
-               os=-sysv4
+       t3e)
+               basic_machine=t3e-cray
+               os=-unicos

                ;;
                ;;

-       necv70)                                         # CYGNUS LOCAL
-               basic_machine=v70-nec
-               os=-sysv
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff

                ;;
                ;;

-       news1000)
-               basic_machine=m68030-sony
-               os=-newsos
+       tx39)
+               basic_machine=mipstx39-unknown

                ;;
                ;;

-       nindy960)
-               basic_machine=i960-intel
-               os=-nindy
+       tx39el)
+               basic_machine=mipstx39el-unknown

                ;;
                ;;

-       pn)
-               basic_machine=pn-gould
-               os=-sysv
+       tower | tower-32)
+               basic_machine=m68k-ncr

                ;;
                ;;

-       np1)
-               basic_machine=np1-gould
-               os=-sysv
+       udi29k)
+               basic_machine=a29k-amd
+               os=-udi

                ;;
        ultra3)
                basic_machine=a29k-nyu
                os=-sym1
                ;;
                ;;
        ultra3)
                basic_machine=a29k-nyu
                os=-sym1
                ;;

+       v810 | necv810)
+               basic_machine=v810-nec
+               os=-none
+               ;;
+       vaxv)
+               basic_machine=vax-dec
+               os=-sysv
+               ;;
+       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


@@ -543,47 +856,29 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
                basic_machine=m68k-wrs
                os=-vxworks
                ;;

-       es1800 | OSE68k | ose68k)                       # CYGNUS LOCAL
-               basic_machine=m68k-ericsson
-               os=-ose
-               ;;
-       OSE68000 | ose68000)                            # CYGNUS LOCAL
-               basic_machine=m68000-ericsson
-               os=-ose
-               ;;
-       os68k)                                          # CYGNUS LOCAL
-               basic_machine=m68k-none
-               os=-os68k
-               ;;
-       sparclite)                                      # CYGNUS LOCAL
-               basic_machine=sparclite-fujitsu
-               os=-none
-               ;;
-       sparclite-wrs)                                  # CYGNUS LOCAL
-               basic_machine=sparclite-wrs
+       vxworks29k)
+               basic_machine=a29k-wrs

                os=-vxworks
                ;;
                os=-vxworks
                ;;

-       sparcfrw)                                       # CYGNUS LOCAL
-               basic_machine=sparcfrw-sun
-               os=-sunos4
+       w65*)
+               basic_machine=w65-wdc
+               os=-none

                ;;
                ;;

-       sparcfrwcompat)                                 # CYGNUS LOCAL
-               basic_machine=sparcfrwcompat-sun
-               os=-sunos4
+       w89k-*)
+               basic_machine=hppa1.1-winbond
+               os=-proelf

                ;;
                ;;

-       sparclitefrw)                                   # CYGNUS LOCAL
-               basic_machine=sparclitefrw-fujitsu
-               os=-none
+       xmp)
+               basic_machine=xmp-cray
+               os=-unicos

                ;;
                ;;

-       sparclitefrwcompat)                             # CYGNUS LOCAL
-               basic_machine=sparclitefrwcompat-fujitsu
-               os=-none
+        xps | xps100)
+               basic_machine=xps100-honeywell

                ;;
                ;;

-       adobe68k)                                       # CYGNUS LOCAL
-               basic_machine=m68010-adobe
-               os=-scout
+       z8k-*-coff)
+               basic_machine=z8k-unknown
+               os=-sim

                ;;
                ;;

-

        none)
                basic_machine=none-none
                os=-none
        none)
                basic_machine=none-none
                os=-none


@@ -591,8 +886,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)
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)
+               basic_machine=hppa1.1-oki
+               ;;

        mips)
        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


@@ -603,12 +911,37 @@ 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
                ;;
                basic_machine=sparc-sun
                ;;

+        cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       orion)
+               basic_machine=orion-highlevel
+               ;;
+       orion105)
+               basic_machine=clipper-highlevel
+               ;;
+       mac | mpw | mac-mpw)
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       c4x*)
+               basic_machine=c4x-none
+               os=-coff
+               ;;

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


@@ -629,26 +962,83 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
 
 # Decode manufacturer-specific aliases for certain operating systems.
 

-if [ "$os" ]
+if [ x"$os" != x"" ]

 then
 case $os in
 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)
+               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.
-       -bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \
-             | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-             | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs* \
-             | -riscos* | -linux* \
-             | -go32 | -linux* | -sim | -es1800* | -udi | -hms* | -xray \
-             | -os68k* | -none* | -v88r* | -aout | -coff | -elf)
-                               # The last two lines above are CYGNUS LOCAL
-       ;;
-# start-sanitize-v9
-       -v7 | -v9 | -hal32 | -hal64) ;;                 # CYGNUS LOCAL
-# end-sanitize-v9
-
+       # 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* \
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+             | -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* \
+             | -chorusos* | -chorusrdb* \
+             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -openstep* | -oskit* | -conix* | -pw32* | -storm-chaos*)
+       # 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|'`
+               ;;
+       -sunos6*)
+               os=`echo $os | sed -e 's|sunos6|solaris3|'`
+               ;;
+       -opened*)
+               os=-openedition
+               ;;
+       -wince*)
+               os=-wince
+               ;;

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


@@ -664,12 +1054,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
                ;;


@@ -682,17 +1085,29 @@ case $os in
        -svr3)
                os=-sysv3
                ;;
        -svr3)
                os=-sysv3
                ;;

-       -ose*)                                          # CYGNUS LOCAL
+       -sysvr4)
+               os=-sysv4
+               ;;
+       # This must come after -sysvr4.
+       -sysv*)
+               ;;
+       -ose*)

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

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

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

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

        -none)
                ;;
        *)
                # Get rid of the `-' at the beginning of $os.
        -none)
                ;;
        *)
                # 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
                ;;


@@ -702,10 +1117,32 @@ else
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.

+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+

 case $basic_machine in
 case $basic_machine in

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


@@ -715,23 +1152,47 @@ case $basic_machine in
                # default.
                # os=-sunos4
                ;;
                # default.
                # os=-sunos4
                ;;

+       m68*-cisco)
+               os=-aout
+               ;;
+       mips*-cisco)
+               os=-elf
+               ;;
+       mips*-*)
+               os=-elf
+               ;;

        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        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)
+               os=-proelf
+               ;;
+       *-winbond)
+               os=-proelf
+               ;;
+       *-oki)
+               os=-proelf
+               ;;

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

-       *-sgi | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+       *-hitachi)
+               os=-hiux
+               ;;
+       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)

                os=-sysv
                ;;
        *-cbm)
                os=-sysv
                ;;
        *-cbm)

-               os=-amigados
+               os=-amigaos

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


@@ -739,17 +1200,62 @@ 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)
+               os=-ptx
+               ;;

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

-       i[34]86-*)
-               os=-sco3.2v2
+       i370-*)
+               os=-mvs
+               ;;
+       *-next)
+               os=-nextstep3
+               ;;
+        *-gould)
+               os=-sysv
+               ;;
+        *-highlevel)
+               os=-bsd
+               ;;
+       *-encore)
+               os=-bsd
+               ;;
+        *-sgi)
+               os=-irix
+               ;;
+        *-siemens)
+               os=-sysv4
+               ;;
+       *-masscomp)
+               os=-rtu
+               ;;
+       f301-fujitsu)
+               os=-uxpv
+               ;;
+       *-rom68k)
+               os=-coff
+               ;;
+       *-*bug)
+               os=-coff
+               ;;
+       *-apple)
+               os=-macos
+               ;;
+       *-atari*)
+               os=-mint

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


@@ -763,15 +1269,27 @@ vendor=unknown
 case $basic_machine in
        *-unknown)
                case $os in
 case $basic_machine in
        *-unknown)
                case $os in

+                       -riscix*)
+                               vendor=acorn
+                               ;;

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

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

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

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

                        -unos*)
                                vendor=crds
                                ;;
                        -unos*)
                                vendor=crds
                                ;;


@@ -784,12 +1302,38 @@ case $basic_machine in
                        -genix*)
                                vendor=ns
                                ;;
                        -genix*)
                                vendor=ns
                                ;;

-                       -vxworks*)                      # CYGNUS LOCAL
+                       -mvs* | -opened*)
+                               vendor=ibm
+                               ;;
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+                       -vxsim* | -vxworks*)

                                vendor=wrs
                                ;;
                                vendor=wrs
                                ;;

+                       -aux*)
+                               vendor=apple
+                               ;;
+                       -hms*)
+                               vendor=hitachi
+                               ;;
+                       -mpw* | -macos*)
+                               vendor=apple
+                               ;;
+                       -*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: