Add dv-mn103tim.c and dv-mn103ser.c

[binutils.git] / config.sub

diff --git a/config.sub b/config.sub
index 802474b291b4586e68d614cddb94052e347fb50e..15ef0803df756313c346be077f7558c0a2e0b694 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,4 +1,29 @@
-#!/bin/sh
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.

 
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.


@@ -11,428 +36,1323 @@
 # Each package is responsible for reporting which valid configurations
 # it does not support.  The user should be able to distinguish
 # a failure to support a valid configuration from a meaningless
 # Each package is responsible for reporting which valid configurations
 # it does not support.  The user should be able to distinguish
 # a failure to support a valid configuration from a meaningless

-# configuration (e.g. a typo).
+# configuration.

 
 

-# Please email any bugs, comments, and/or additions to this file to:
-# [email protected]
+# 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.

 
 

-# decode aliases into canonical names
+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

 
 

-case "$1" in
-# cpu alone is a valid alias for cpu-none-none.
-vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
-       | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
-       | romp | rs6000 | i960 | h8300)
-       cpu=$1
-       vendor=none
-       os=none
-       ;;
-altos | altos3068)
-       cpu=m68k
-       vendor=altos
-       os=sysv # maybe?
-       ;;
-altosgas)
-       cpu=m68k
-       vendor=altos
-       os=gas
-       ;;
-am29k)
-       cpu=a29k
-       vendor=none
-       os=bsd
-       ;;
-amdahl)
-       cpu=580
-       vendor=amdahl
-       os=uts
-       ;;
-amigados)
-       cpu=m68k
-       vendor=cbm
-       os=amigados # Native AmigaDOS
-       ;;
-amigaunix | amix)
-       cpu=m68k
-       vendor=cbm
-       os=svr4 # System V Release 4 (svr4 is an industry recognized acronym)
-       ;;
-apollo68)
-       cpu=m68k
-       vendor=apollo
-       os=sysv # maybe?
-       ;;
-balance)
-       cpu=ns32k
-       vendor=sequent
-       os=dynix
-       ;;
-convex-c1)
-       cpu=c1
-       vendor=convex
-       os=sysv # maybe?
-       ;;
-convex-c2)
-       cpu=c2
-       vendor=convex
-       os=sysv # maybe?
-       ;;
-cray | ymp)
-       cpu=ymp
-       vendor=cray
-       os=unicos
-       ;;
-cray2)
-       cpu=cray2
-       vendor=cray
-       os=unicos
-       ;;
-dec3100 | decstatn | decstation | decstation-3100 | pmax | pmin)
-       cpu=mips
-       vendor=dec
-       os=ultrix
-       ;;
-delta | 3300 | motorola-3300 | motorola-delta \
-      | 3300-motorola | delta-motorola)
-       cpu=m68k
-       vendor=motorola
-       os=sysv # maybe?
+# First pass through any local machine types.
+case $1 in
+       *local*)
+               echo $1
+               exit 0
+               ;;
+       *)

        ;;
        ;;

+esac

 
 

-delta88)
-       cpu=m88k
-       vendor=motorola
-       os=m88kbcs
-       ;;
+# CYGNUS LOCAL marketing-names
+# Here we handle any "marketing" names - translating them to
+#  standard triplets
+case $1 in 
+       mips-tx39-elf)
+               set mipstx39-unknown-elf
+                ;;
+# start-sanitize-tx19
+       mips-tx19-elf)
+               set mipstx19-unknown-elf
+                ;;
+# end-sanitize-tx19
+# start-sanitize-tx49
+       mips-tx49-elf)
+               set mips64tx49-unknown-elf
+                ;;
+# end-sanitize-tx49
+# start-sanitize-vr4111
+       mips-vr4111-elf)
+               set mips64vr4111-unknown-elf
+                ;;
+# end-sanitize-vr4111
+# start-sanitize-vr5400
+       mips64vr5xxx-elf)
+               set mips64vr5000-elf
+                ;;
+# end-sanitize-vr5400
+       *)
+               ;;
+esac
+# END CYGNUS LOCAL marketing-names

 
 

-gmicro)
-       cpu=tron
-       vendor=gmicro
-       os=sysv # maybe?
-       ;;
-# start-sanitize-v9
-hal-32 | hal32)
-       cpu=sparc64
-       vendor=hal
-       os=hal32
-       ;;
-hal-64 | hal64)
-       cpu=sparc64
-       vendor=hal
-       os=hal64
-       ;;
-sparc64)
-       cpu=sparc64
-       vendor=sun
-       os=v9
-       ;;
-sparc64-v7 | sparc64v7)
-       cpu=sparc64
-       vendor=sun
-       os=v7
-       ;;
-# end-sanitize-v9
-hp300bsd)
-       cpu=m68k
-       vendor=hp
-       os=bsd
-       ;;
-hp300hpux | hpux | hp9k3[2-9][0-9])
-       cpu=m68k
-       vendor=hp
-       os=hpux
-       ;;
-hp9k31[0-9] | hp9k2[0-9][0-9])
-       cpu=m68000
-       vendor=hp
-       os=hpux
-       ;;
-i386sco)
-       cpu=i386
-       vendor=sco
-       os=sysv # maybe?
-       ;;
-i386v)
-       cpu=i386
-       vendor=none
-       os=sysv
-       ;;
-i386v32)
-       cpu=i386
-       vendor=none
-       os=sysv32
-       ;;
-iris | iris4d)
-       cpu=mips
-       vendor=sgi
-       os=irix # maybe?
-       ;;
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac

 
 

-dpx2)
-       vendor=bull
-       cpu=m68k
-       os=sysv
-       ;;
-isi | isi68)
-       cpu=m68k
-       vendor=isi
-       os=sysv # maybe?
-       ;;
-littlemips)
-       cpu=mips
-       vendor=little
-       os=bsd
-       ;;
-magnum | m3230)
-       cpu=mips
-       vendor=mips
-       os=sysv # maybe?
-       ;;
-merlin)
-       cpu=ns32k
-       vendor=utek
-       os=sysv # maybe?
-       ;;
-miniframe)
-       cpu=m68000
-       vendor=convergent
-       os=sysv # maybe?
-       ;;
-mmax)
-       cpu=ns32k
-       vendor=encore
-       os=sysv # maybe?
-       ;;
-news | news700 | news800 | news900)
-       cpu=m68k
-       vendor=sony
-       os=newsos3 # Based on bsd-4.3
-       ;;
-news1000)
-       cpu=m68030
-       vendor=sony
-       os=newsos3 # ?
-       ;;
-news-3600 | bigmips | risc-news)
-       cpu=mips
-       vendor=sony
-       os=newsos4 # Presumably?
-       ;;
-next)
-       cpu=m68k
-       vendor=next
-       os=sysv # maybe?
-       ;;
-nindy960)
-       cpu=i960
-       vendor=intel
-       os=nindy
-       ;;
-none)
-       cpu=none
-       vendor=none
-       os=none
-       ;;
-np1)
-       cpu=np1
-       vendor=gould
-       os=sysv # maybe?
-       ;;
-rtpc)
-       cpu=romp
-       vendor=ibm
-       os=aix # maybe?
-       ;;      
-pbd)
-       cpu=sparc
-       vendor=unicom
-       os=sysv
-       ;;
-pn)
-       cpu=pn
-       vendor=gould
-       os=sysv # maybe?
-       ;;
-ps2)
-       cpu=i386
-       vendor=ibm
-       os=sysv # maybe?
-       ;;
-sun2)
-       cpu=m68000
-       vendor=sun
-       os=sunos4
-       ;;
-sun2os3)
-       cpu=m68000
-       vendor=sun
-       os=sunos3
-       ;;
-sun2os4)
-       cpu=m68000
-       vendor=sun
-       os=sunos4
-       ;;
-sun3)
-       cpu=m68k
-       vendor=sun
-       os=sunos4
-       ;;
-sun3os3)
-       cpu=m68k
-       vendor=sun
-       os=sunos3
-       ;;
-sun3os4)
-       cpu=m68k
-       vendor=sun
-       os=sunos4
-       ;;
-sun386 | roadrunner | sun386i)
-       cpu=i386
-       vendor=sun
-       os=sunos
-       ;;
-sun4)
-       cpu=sparc
-       vendor=sun
-       os=sunos4
-       ;;
-sun4os3)
-       cpu=sparc
-       vendor=sun
-       os=sunos3
-       ;;
-sun4os4)
-       cpu=sparc
-       vendor=sun
-       os=sunos4
-       ;;
-symmetry)
-       cpu=i386
-       vendor=sequent
-       os=dynix
-       ;;
-tower | tower-32)
-       cpu=m68k
-       vendor=ncr
-       os=sysv # maybe?
-       ;;
-ultra3)
-       cpu=a29k
-       vendor=nyu
-       os=sym1
-       ;;
-umax)
-       cpu=ns32k
-       vendor=encore
-       os=sysv # maybe?
-       ;;
-unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300)
-       cpu=m68k
-       vendor=att
-       os=sysv # maybe?
-       ;;
-vax-dec)
-       cpu=vax
-       vendor=dec
-       os=ultrix # maybe?
-       ;;
-vxworks68)
-       cpu=m68k
-       vendor=wrs
-       os=vxworks
-       ;;
-vxworks960)
-       cpu=i960
-       vendor=wrs
-       os=vxworks
-       ;;
-xmp)
-       cpu=xmp
-       vendor=cray
-       os=unicos
-       ;;
-# not an alias.  parse what we expect to be a canonical name.
-*)
-       cpu=`echo $1 | sed 's/-.*$//'`
+### 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
+       -sun*os*)
+               # Prevent following clause from handling this invalid input.
+               ;;
+       -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* | -hitachi* |\
+       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+       -apple)
+               os=
+               basic_machine=$1
+               ;;
+       -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
+               os=
+               basic_machine=$1
+               ;;
+       -scout)                                         # CYGNUS LOCAL
+               ;;
+       -wrs)                                           # CYGNUS LOCAL
+               os=vxworks
+               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
+               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*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -lynx*)
+               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
+               ;;
+esac

 
 

-       if [ "${cpu}" = "$1" ] ; then
-               # no vendor so this is an invalid name.
-               echo '***' No vendor: configuration \`$1\' not recognized 1>&2
+# 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 | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+               | arme[lb] | pyramid | mn10200 | mn10300 \
+               | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+               | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+               | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+               | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+               | mipstx39 | mipstx39el \
+               | sparc | sparclet | sparclite | sparc64 | v850)
+               basic_machine=$basic_machine-unknown
+               ;;
+       m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
+               basic_machine=$basic_machine-unknown
+               ;;
+       thumb) # CYGNUS LOCAL: angela/thumb
+               basic_machine=$basic_machine-unknown
+               ;;
+# start-sanitize-vr4320
+       mips64vr4320 | mips64vr4320el)
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-vr4320
+       mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith/vr4300
+               basic_machine=$basic_machine-unknown
+               ;;
+       mips64vr4100 | mips64vr4100el) # CYGNUS LOCAL jsmith/vr4100
+               basic_machine=$basic_machine-unknown
+               ;;
+       mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
+               basic_machine=$basic_machine-unknown
+               ;;
+# start-sanitize-vr4111
+       mips64vr4111 | mips64vr4111el)
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-vr4111
+# start-sanitize-vr5400
+       mips64vr5400)                    # CYGNUS LOCAL cagney/vr5400
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-vr5400
+# start-sanitize-tx19
+        mipstx19 | mipstx19el)
+                basic_machine=$basic_machine-unknown
+                ;;
+# end-sanitize-tx19
+# start-sanitize-tx49
+       mips64tx49 | mips64tx49el)
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-tx49
+# start-sanitize-r5900
+       mips64r5900 | mips64r5900el) # CYGNUS LOCAL gavin/r5900
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-r5900
+       mips16) # CYGNUS LOCAL krk/mips16
+               basic_machine=$basic_machine-unknown
+               ;;
+       tic30) # CYGNUS LOCAL ian/tic30
+               basic_machine=$basic_machine-unknown
+               ;;
+       c30) # CYGNUS LOCAL ian/tic30
+               basic_machine=tic30-unknown
+               ;;
+# start-sanitize-tic80
+       tic80)                          # CYGNUS LOCAL fnf/TIc80
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-tic80
+# start-sanitize-sky
+       dvp)
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-sky
+# start-sanitize-v850e
+       v850e)                          # CYGNUS LOCAL jtc/v850
+               basic_machine=$basic_machine-unknown
+               ;;
+       v850ea)                         # CYGNUS LOCAL jtc/v850
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-v850e
+       d10v)                           # CYGNUS LOCAL meissner/d10v
+               basic_machine=$basic_machine-unknown
+               ;;
+# start-sanitize-d30v
+       d30v)                           # CYGNUS LOCAL hunt/d30v
+               basic_machine=$basic_machine-unknown
+               ;;
+# end-sanitize-d30v
+       # We use `pc' rather than `unknown'
+       # because (1) that's what they normally are, and
+       # (2) the word "unknown" tends to confuse beginning users.
+       i[3456]86)
+         basic_machine=$basic_machine-pc
+         ;;
+       # Object if more than one company name word.
+       *-*-*)
+               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2

                exit 1
                exit 1

-       else
-               # parse out vendor
-               rest=`echo $1 | sed "s/${cpu}-//"`
-               vendor=`echo ${rest} | sed 's/-.*$//'`
+               ;;
+       # Recognize the basic CPU types with company name.
+       vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+             | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+             | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+             | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+             | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+             | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+             | sparc64-* | mips64-* | mipsel-* \
+             | mips64el-* | mips64orion-* | mips64orionel-* \
+             | mipstx39-* | mipstx39el-* \
+             | f301-*)
+               ;;
+       m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # CYGNUS LOCAL
+               ;;
+       thumb-*) # CYGNUS LOCAL angela/thumb
+               ;;
+# start-sanitize-sky
+       dvp-* | txvu-*)
+               ;;
+# end-sanitize-sky
+       v850-*) # CYGNUS LOCAL
+               ;;
+# start-sanitize-v850e
+       v850e-*) # CYGNUS LOCAL
+               ;;
+       v850ea-*) # CYGNUS LOCAL
+               ;;
+# end-sanitize-v850e
+# start-sanitize-d30v
+       d30v-*) # CYGNUS LOCAL
+               ;;
+# end-sanitize-d30v
+# start-sanitize-vr4320
+       mips64vr4320-* | mips64vr4320el-*)
+               ;;
+# end-sanitize-vr4320
+       mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith/vr4300
+               ;;
+       mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
+               ;;
+# start-sanitize-vr4111
+       mips64vr4111-* | mips64vr4111el-*)
+               ;;
+# end-sanitize-vr4111
+# start-sanitize-tx19
+       mipstx19-* | mipstx19el-*)
+               ;;
+# end-sanitize-tx19
+# start-sanitize-tx49
+       mips64tx49-* | mips64tx49el-*)
+               ;;
+# end-sanitize-tx49
+# start-sanitize-r5900
+       mips64r5900-* | mips64r5900el-*) # CYGNUS LOCAL gavin/r5900
+                ;;
+# end-sanitize-r5900
+       mips16-*) # CYGNUS LOCAL krk/mips16
+               ;;
+       tic30-*) # CYGNUS LOCAL ian/tic30
+               ;;
+       c30-*) # CYGNUS LOCAL ian/tic30
+               basic_machine=tic30-unknown
+               ;;
+# start-sanitize-tic80
+       tic80-*)                                                # CYGNUS LOCAL fnf/TIc80
+               ;;
+# end-sanitize-tic80
+       # Recognize the various machine names and aliases which stand
+       # for a CPU type and a company and sometimes even an OS.
+       386bsd)                                         # CYGNUS LOCAL
+               basic_machine=i386-unknown
+               os=-bsd
+               ;;
+       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+               basic_machine=m68000-att
+               ;;
+       3b*)
+               basic_machine=we32k-att
+               ;;
+       a29khif)                                        # CYGNUS LOCAL
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       adobe68k)                                       # CYGNUS LOCAL
+               basic_machine=m68010-adobe
+               os=-scout
+               ;;
+       alliant | fx80)
+               basic_machine=fx80-alliant
+               ;;
+       altos | altos3068)
+               basic_machine=m68k-altos
+               ;;
+       am29k)
+               basic_machine=a29k-none
+               os=-bsd
+               ;;
+       amdahl)
+               basic_machine=580-amdahl
+               os=-sysv
+               ;;
+       amiga | amiga-*)
+               basic_machine=m68k-cbm
+               ;;
+       amigados)
+               basic_machine=m68k-cbm
+               os=-amigados
+               ;;
+       amigaunix | amix)
+               basic_machine=m68k-cbm
+               os=-sysv4
+               ;;
+       apollo68)
+               basic_machine=m68k-apollo
+               os=-sysv
+               ;;
+       apollo68bsd)                                    # CYGNUS LOCAL
+               basic_machine=m68k-apollo
+               os=-bsd
+               ;;
+       aux)
+               basic_machine=m68k-apple
+               os=-aux
+               ;;
+       balance)
+               basic_machine=ns32k-sequent
+               os=-dynix
+               ;;
+       convex-c1)
+               basic_machine=c1-convex
+               os=-bsd
+               ;;
+       convex-c2)
+               basic_machine=c2-convex
+               os=-bsd
+               ;;
+       convex-c32)
+               basic_machine=c32-convex
+               os=-bsd
+               ;;
+       convex-c34)
+               basic_machine=c34-convex
+               os=-bsd
+               ;;
+       convex-c38)
+               basic_machine=c38-convex
+               os=-bsd
+               ;;
+       cray | ymp)
+               basic_machine=ymp-cray
+               os=-unicos
+               ;;
+       cray2)
+               basic_machine=cray2-cray
+               os=-unicos
+               ;;
+       [ctj]90-cray)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;
+       crds | unos)
+               basic_machine=m68k-crds
+               ;;
+       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
+               ;;
+       es1800 | OSE68k | ose68k | ose | OSE)           # CYGNUS LOCAL
+               basic_machine=m68k-ericsson
+               os=-ose
+               ;;
+       fx2800)
+               basic_machine=i860-alliant
+               ;;
+       genix)
+               basic_machine=ns32k-ns
+               ;;
+       gmicro)
+               basic_machine=tron-gmicro
+               os=-sysv
+               ;;
+       h3050r* | hiux*)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       h8300hms)
+               basic_machine=h8300-hitachi
+               os=-hms
+               ;;
+       h8300xray)                                      # CYGNUS LOCAL
+               basic_machine=h8300-hitachi
+               os=-xray
+               ;;
+       h8500hms)                                       # CYGNUS LOCAL
+               basic_machine=h8500-hitachi
+               os=-hms
+               ;;
+       harris)
+               basic_machine=m88k-harris
+               os=-sysv3
+               ;;
+       hp300-*)
+               basic_machine=m68k-hp
+               ;;
+       hp300bsd)
+               basic_machine=m68k-hp
+               os=-bsd
+               ;;
+       hp300hpux)
+               basic_machine=m68k-hp
+               os=-hpux
+               ;;
+        w89k-*)                                                # CYGNUS LOCAL
+                basic_machine=hppa1.1-winbond
+                os=-proelf
+                ;;
+        op50n-*)                                       # CYGNUS LOCAL
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        op60c-*)                                       # CYGNUS LOCAL
+                basic_machine=hppa1.1-oki
+                os=-proelf
+                ;;
+        hppro)                                         # CYGNUS LOCAL
+                basic_machine=hppa1.1-hp
+                os=-proelf
+                ;;
+       hp9k2[0-9][0-9] | hp9k31[0-9])
+               basic_machine=m68000-hp
+               ;;
+       hp9k3[2-9][0-9])
+               basic_machine=m68k-hp
+               ;;
+       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
+               ;;
+       hppa-next)
+               os=-nextstep3
+               ;;
+       hppaosf)                                        # CYGNUS LOCAL
+               basic_machine=hppa1.1-hp
+               os=-osf
+               ;;
+       i370-ibm* | ibm*)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+       i[3456]86v32)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv32
+               ;;
+       i[3456]86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv4
+               ;;
+       i[3456]86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv
+               ;;
+       i[3456]86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-solaris2
+               ;;
+       i386mach)                                       # CYGNUS LOCAL
+               basic_machine=i386-mach
+               os=-mach
+               ;;
+       i386-vsta | vsta)                               # CYGNUS LOCAL
+               basic_machine=i386-unknown
+               os=-vsta
+               ;;
+       i386-go32 | go32)                               # CYGNUS LOCAL
+               basic_machine=i386-unknown
+               os=-go32
+               ;;
+       i386-mingw32 | mingw32)
+               basic_machine=i386-unknown
+               os=-mingw32
+               ;;
+       iris | iris4d)
+               basic_machine=mips-sgi
+               case $os in
+                   -irix*)
+                       ;;
+                   *)
+                       os=-irix4
+                       ;;
+               esac
+               ;;
+       isi68 | isi)
+               basic_machine=m68k-isi
+               os=-sysv
+               ;;
+       m88k-omron*)
+               basic_machine=m88k-omron
+               ;;
+       magnum | m3230)
+               basic_machine=mips-mips
+               os=-sysv
+               ;;
+       merlin)
+               basic_machine=ns32k-utek
+               os=-sysv
+               ;;
+       miniframe)
+               basic_machine=m68000-convergent
+               ;;
+       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
+               ;;
+       monitor)                                        # CYGNUS LOCAL
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       msdos)                                          # CYGNUS LOCAL
+               basic_machine=i386-unknown      
+               os=-msdos
+               ;;
+       ncr3000)
+               basic_machine=i486-ncr
+               os=-sysv4
+               ;;
+       netbsd386)
+               basic_machine=i386-unknown              # CYGNUS LOCAL
+               os=-netbsd
+               ;;
+       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
+               ;;
+       necv70)                                         # CYGNUS LOCAL
+               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)                                         # CYGNUS LOCAL
+               basic_machine=i960-intel
+               os=-mon960
+               ;;
+       np1)
+               basic_machine=np1-gould
+               ;;
+       OSE68000 | ose68000)                            # CYGNUS LOCAL
+               basic_machine=m68000-ericsson
+               os=-ose
+               ;;
+       os68k)                                          # CYGNUS LOCAL
+               basic_machine=m68k-none
+               os=-os68k
+               ;;
+       pa-hitachi)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       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)
+               basic_machine=i586-intel
+               ;;
+       pentiumpro | p6)
+               basic_machine=i686-intel
+               ;;
+       pentium-* | p5-*)
+               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumpro-* | p6-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       k5)
+               # We don't have specific support for AMD's K5 yet, so just call it a Pentium
+               basic_machine=i586-amd
+               ;;
+       nexen)
+               # We don't have specific support for Nexgen yet, so just call it a Pentium
+               basic_machine=i586-nexgen
+               ;;
+       pn)
+               basic_machine=pn-gould
+               ;;
+       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
+               ;;
+# start-sanitize-tx19
+       r1900)
+               basic_machine=mipstx19-unknown
+               ;;
+       r1900el)
+               basic_machine=mipstx19el-unknown
+               ;;
+# end-sanitize-tx19
+# start-sanitize-r5900
+        r5900 | r5900el)                                # CYGNUS LOCAL
+                basic_machine=mips64r5900-unknown
+                ;;
+# end-sanitize-r5900
+       rom68k)                                         # CYGNUS LOCAL
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       rm[46]00)
+               basic_machine=mips-siemens
+               ;;
+       rtpc | rtpc-*)
+               basic_machine=romp-ibm
+               ;;
+       sa29200)                                        # CYGNUS LOCAL
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       sequent)
+               basic_machine=i386-sequent
+               ;;
+       sh)
+               basic_machine=sh-hitachi
+               os=-hms
+               ;;
+       sparclite-wrs)                                  # CYGNUS LOCAL
+               basic_machine=sparclite-wrs
+               os=-vxworks
+               ;;
+       sps7)
+               basic_machine=m68k-bull
+               os=-sysv2
+               ;;
+       spur)
+               basic_machine=spur-unknown
+               ;;
+       st2000)                                         # CYGNUS LOCAL
+               basic_machine=m68k-tandem
+               ;;
+       stratus)                                        # CYGNUS LOCAL
+               basic_machine=i860-stratus
+               os=-sysv4
+               ;;
+       sun2)
+               basic_machine=m68000-sun
+               ;;
+       sun2os3)
+               basic_machine=m68000-sun
+               os=-sunos3
+               ;;
+       sun2os4)
+               basic_machine=m68000-sun
+               os=-sunos4
+               ;;
+       sun3os3)
+               basic_machine=m68k-sun
+               os=-sunos3
+               ;;
+       sun3os4)
+               basic_machine=m68k-sun
+               os=-sunos4
+               ;;
+       sun4os3)
+               basic_machine=sparc-sun
+               os=-sunos3
+               ;;
+       sun4os4)
+               basic_machine=sparc-sun
+               os=-sunos4
+               ;;
+       sun4sol2)
+               basic_machine=sparc-sun
+               os=-solaris2
+               ;;
+       sun3 | sun3-*)
+               basic_machine=m68k-sun
+               ;;
+       sun4)
+               basic_machine=sparc-sun
+               ;;
+       sun386 | sun386i | roadrunner)
+               basic_machine=i386-sun
+               ;;
+       symmetry)
+               basic_machine=i386-sequent
+               os=-dynix
+               ;;
+# start-sanitize-tx19
+       tx19)
+               basic_machine=mipstx19-unknown
+               ;;
+       tx19el)
+               basic_machine=mipstx19el-unknown
+               ;;
+# end-sanitize-tx19
+       tx39)
+               basic_machine=mipstx39-unknown
+               ;;
+       tx39el)
+               basic_machine=mipstx39el-unknown
+               ;;
+       tower | tower-32)
+               basic_machine=m68k-ncr
+               ;;
+       udi29k)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       ultra3)
+               basic_machine=a29k-nyu
+               os=-sym1
+               ;;
+       v810 | necv810)                                 # CYGNUS LOCAL
+               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
+               ;;
+       vxworks68)
+               basic_machine=m68k-wrs
+               os=-vxworks
+               ;;
+       vxworks29k)
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;
+       w65*)                                           # CYGNUS LOCAL
+               basic_machine=w65-wdc
+               os=-none
+               ;;
+       xmp)
+               basic_machine=xmp-cray
+               os=-unicos
+               ;;
+        xps | xps100)
+               basic_machine=xps100-honeywell
+               ;;
+       z8k-*-coff)                                     # CYGNUS LOCAL
+               basic_machine=z8k-unknown
+               os=-sim
+               ;;
+       none)
+               basic_machine=none-none
+               os=-none
+               ;;

 
 

-               if [ "${vendor}" = "${rest}" ] ; then
-                       # a missing os is acceptable
-                       os=none
+# 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
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)                                          # CYGNUS LOCAL
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)                                          # CYGNUS LOCAL
+               basic_machine=hppa1.1-oki
+               ;;
+       mips)
+               if [ x$os = x-linux-gnu ]; then
+                       basic_machine=mips-unknown

                else
                else

-                       os=`echo ${rest} | sed "s/${vendor}-//"`
+                       basic_machine=mips-mips

                fi
                fi

-       fi
-       ;;
+               ;;
+       romp)
+               basic_machine=romp-ibm
+               ;;
+       rs6000)
+               basic_machine=rs6000-ibm
+               ;;
+       vax)
+               basic_machine=vax-dec
+               ;;
+       pdp11)
+               basic_machine=pdp11-dec
+               ;;
+       we32k)
+               basic_machine=we32k-att
+               ;;
+       sparc)
+               basic_machine=sparc-sun
+               ;;
+        cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       orion)
+               basic_machine=orion-highlevel
+               ;;
+       orion105)
+               basic_machine=clipper-highlevel
+               ;;
+       mac | mpw | mac-mpw)                            # CYGNUS LOCAL
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)                                # CYGNUS LOCAL
+               basic_machine=powerpc-apple
+               ;;
+       *)
+               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+               exit 1
+               ;;

 esac
 
 esac
 

-# At this point we should have three parts of a canonical name in cpu,
-# vendor, and os.
-
-# verify that the cpu is known.
-
-case "${cpu}" in
-none | vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc \
-       | ns32k | alliant | arm | c1 | c2 | mips | pyramid | tron \
-       | a29k | romp | rs6000 | i960 | xmp | ymp | cray2 | 580 | h8300)
-       ;;
-
-# start-sanitize-v9
-sparc64) ;;
-# end-sanitize-v9
-
-*)
-       echo '***' Invalid cpu \`${cpu}\': configuration \`$1\' not recognized 1>&2
-       exit 1
-       ;;
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+       *-digital*)
+               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+               ;;
+       *-commodore*)
+               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+               ;;
+       *)
+               ;;

 esac
 
 esac
 

-# verify that the vendor is known.
-
-case "${vendor}" in
-       altos | amdahl | aout | apollo | att | bcs | bout |\
-       cbm | convergent | convex | coff | cray | dec | encore |\
-       gould | intel | isi | hp | ibm | little | mips | motorola |\
-       ncr | next | none | nyu | sco | sequent | sgi | sony | sun |\
-       unicom | utek | wrs | bull ) ;; 
-
-# start-sanitize-v9
-hal) ;;
-# end-sanitize-v9
+# Decode manufacturer-specific aliases for certain operating systems.

 
 

-*)
-       echo '***' Invalid vendor \`${vendor}\': configuration \`$1\' not recognized 1>&2
-       exit 1
-       ;;
+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)
+               os=-solaris2
+               ;;
+       -unixware* | svr4*)
+               os=-sysv4
+               ;;
+       -gnu/linux*)
+               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+               ;;
+       # First accept the basic system types.
+       # The portable systems comes first.
+       # 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* \
+             | -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* \
+             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+             | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -mingw32* | -linux-gnu* | -uxpv*)
+       # Remember, each alternative MUST END IN *, to match a version number.
+               ;;
+       # CYGNUS LOCAL
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
+             | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
+               ;;
+       -mac*)
+               os=`echo $os | sed -e 's|mac|macos|'`
+               ;;
+       # END CYGNUS LOCAL
+       -linux*)
+               os=`echo $os | sed -e 's|linux|linux-gnu|'`
+               ;;
+       -sunos5*)
+               os=`echo $os | sed -e 's|sunos5|solaris2|'`
+               ;;
+       -sunos6*)
+               os=`echo $os | sed -e 's|sunos6|solaris3|'`
+               ;;
+       -osfrose*)
+               os=-osfrose
+               ;;
+       -osf*)
+               os=-osf
+               ;;
+       -utek*)
+               os=-bsd
+               ;;
+       -dynix*)
+               os=-bsd
+               ;;
+       -acis*)
+               os=-aos
+               ;;
+       -386bsd)                                        # CYGNUS LOCAL
+               os=-bsd
+               ;;
+       -ctix* | -uts*)
+               os=-sysv
+               ;;
+       -ns2 )
+               os=-nextstep2
+               ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+               os=`echo $os | sed -e 's|sinix|sysv|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;
+       -triton*)
+               os=-sysv3
+               ;;
+       -oss*)
+               os=-sysv3
+               ;;
+       -svr4)
+               os=-sysv4
+               ;;
+       -svr3)
+               os=-sysv3
+               ;;
+       -sysvr4)
+               os=-sysv4
+               ;;
+       # This must come after -sysvr4.
+       -sysv*)
+               ;;
+       -ose*)                                          # CYGNUS LOCAL
+               os=-ose
+               ;;
+       -es1800*)                                       # CYGNUS LOCAL
+               os=-ose
+               ;;
+       -xenix)
+               os=-xenix
+               ;;
+       -none)
+               ;;
+       *)
+               # Get rid of the `-' at the beginning of $os.
+               os=`echo $os | sed 's/[^-]*-//'`
+               echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+               exit 1
+               ;;

 esac
 esac

+else

 
 

-# verify that the os is known, if it exists.
+# 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.

 
 

-case "${os}" in
-aix* | aout | bout | bsd* | coff | ctix* | dynix* | esix* | hpux* | irix* \
-       | isc* | kern | mach* | newsos* | nindy* | none | osf* | sco* \
-       | sunos* | sysv* | ultrix* | unos* | v88r* | vms* | vxworks* \
-       | sym[1-9]* | unicos* | uts | svr4 | amigados)
-       ;;
+# 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.

 
 

-# start-sanitize-v9
-hal32 | hal64 | v7 | v9) ;;
-# end-sanitize-v9
+case $basic_machine in
+       *-acorn)
+               os=-riscix1.2
+               ;;
+       arm*-semi)
+               os=-aout
+               ;;
+        pdp11-*)
+               os=-none
+               ;;
+       *-dec | vax-*)
+               os=-ultrix4.2
+               ;;
+       m68*-apollo)
+               os=-domain
+               ;;
+       i386-sun)
+               os=-sunos4.0.2
+               ;;
+       m68000-sun)
+               os=-sunos3
+               # This also exists in the configure program, but was not the
+               # default.
+               # os=-sunos4
+               ;;
+       m68*-cisco)                                     # CYGNUS LOCAL
+               os=-aout
+               ;;
+       mips*-cisco)                                    # CYGNUS LOCAL
+               os=-elf
+               ;;
+        mips*-*)                                        # CYGNUS LOCAL
+                os=-elf
+                ;;
+       *-tti)  # must be before sparc entry or we get the wrong os.
+               os=-sysv3
+               ;;
+       sparc-* | *-sun)
+               os=-sunos4.1.1
+               ;;
+       *-be)                                           # CYGNUS LOCAL
+               os=-beos
+               ;;
+       *-ibm)
+               os=-aix
+               ;;
+       *-wec)                                          # CYGNUS LOCAL
+               os=-proelf
+               ;;
+       *-winbond)                                      # CYGNUS LOCAL
+               os=-proelf
+               ;;
+       *-oki)                                          # CYGNUS LOCAL
+               os=-proelf
+               ;;
+       *-hp)
+               os=-hpux
+               ;;
+       *-hitachi)
+               os=-hiux
+               ;;
+       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+               os=-sysv
+               ;;
+       *-cbm)
+               os=-amigados
+               ;;
+       *-dg)
+               os=-dgux
+               ;;
+       *-dolphin)
+               os=-sysv3
+               ;;
+       m68k-ccur)
+               os=-rtu
+               ;;
+       m88k-omron*)
+               os=-luna
+               ;;
+       *-next )
+               os=-nextstep
+               ;;
+       *-sequent)
+               os=-ptx
+               ;;
+       *-crds)
+               os=-unos
+               ;;
+       *-ns)
+               os=-genix
+               ;;
+       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)                                       # CYGNUS LOCAL
+               os=-coff
+               ;;
+       *-*bug)                                         # CYGNUS LOCAL
+               os=-coff
+               ;;
+       *-apple)                                        # CYGNUS LOCAL
+               os=-macos
+               ;;
+       *)
+               os=-none
+               ;;
+esac
+fi

 
 

-*)
-       echo '***' Invalid os \`${os}\': configuration \`$1\' not recognized 1>&2
-       exit 1
-       ;;
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+       *-unknown)
+               case $os in
+                       -riscix*)
+                               vendor=acorn
+                               ;;
+                       -sunos*)
+                               vendor=sun
+                               ;;
+                       -aix*)
+                               vendor=ibm
+                               ;;
+                       -beos*)                                         # CYGNUS LOCAL
+                               vendor=be
+                               ;;
+                       -hpux*)
+                               vendor=hp
+                               ;;
+                       -hiux*)
+                               vendor=hitachi
+                               ;;
+                       -unos*)
+                               vendor=crds
+                               ;;
+                       -dgux*)
+                               vendor=dg
+                               ;;
+                       -luna*)
+                               vendor=omron
+                               ;;
+                       -genix*)
+                               vendor=ns
+                               ;;
+                       -mvs*)
+                               vendor=ibm
+                               ;;
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+                       -vxsim* | -vxworks*)
+                               vendor=wrs
+                               ;;
+                       -aux*)
+                               vendor=apple
+                               ;;
+                       -hms*)                          # CYGNUS LOCAL
+                               vendor=hitachi
+                               ;;
+                       -mpw* | -macos*)                # CYGNUS LOCAL
+                               vendor=apple
+                               ;;
+               esac
+               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+               ;;

 esac
 
 esac
 

-echo ${cpu}-${vendor}-${os}
+echo $basic_machine$os