X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=config.sub;h=96d28e2e082f6c9352f0b3376b44b84f5f174b5e;hb=c5d09c0f87b22a7097d86a1bd6807784ca9562bc;hp=ebf934a1de69a83b6c1359b60dd7f704929355ad;hpb=aa6db7818034d13da636a7607ca0ce9502a31e6c;p=deliverable%2Fbinutils-gdb.git

diff --git a/config.sub b/config.sub
index ebf934a1de..96d28e2e08 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,29 @@
-#!/bin/sh
+#! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -36,6 +41,8 @@
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# 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 ]
@@ -57,11 +64,56 @@ case $1 in
 	;;
 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
+# 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-cygnus
+	mips64vr5xxx-elf)
+		set mips64vr5000-elf
+                ;;
+	mips64vr5xxxel-elf)
+		set mips64vr5000el-elf
+                ;;
+# end-sanitize-cygnus
+# start-sanitize-sky
+	vpu-elf)
+		set mips64el-skyb-elf
+		;;
+# end-sanitize-sky
+	*)
+		;;
+esac
+# END CYGNUS LOCAL marketing-names
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also
@@ -73,11 +125,15 @@ case $os in
 		;;
 	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
 	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next* | -hp | -isi* | -apollo | -altos* | \
+	-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 | \
-	-sim | -cisco)						# CYGNUS LOCAL
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond )	# CYGNUS LOCAL
 		os=
 		basic_machine=$1
 		;;
@@ -87,47 +143,53 @@ case $os in
 		os=vxworks
 		basic_machine=$1
 		;;
-	-unixware)					# CYGNUS LOCAL
-		os=-sysv4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
-		;;
 	-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-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-lynx)
+	-lynx*)
 		os=-lynxos
 		;;
-	-os9k)
-		os=-os9k
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
-	-os9)
-		os=-os9
+	-psos*)
+		os=-psos
 		;;
 esac
 
@@ -135,127 +197,238 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i[34]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
-		| tron | a29k | 580 | i960 | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | sparclite | i370 \
-		| powerpc \
-		| h8300 | h8300h | sh \
-		| m88110 | sparc | m680[01234]0 | m683?2 | z8k | v70 \
-		| h8500 | mips64 | mipsel | mips64el) # CYGNUS LOCAL
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
+		| tron | a29k | 580 | i960 | h8300 \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | sparc86x | v850 \
+		| c4x)
 		basic_machine=$basic_machine-unknown
 		;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+	m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
+		| h8500 | w65 | fr30) # CYGNUS LOCAL
+		basic_machine=$basic_machine-unknown
 		;;
-	# Recognize the basic CPU types 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-* | i960-* | xmp-* | ymp-* \
-	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | powerpc \
-	      | h8300-* | h8300h-* | sh-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | z8k-* | h8500-* \
-	      | mips64-* | mipsel-* | mips64el-*) # CYGNUS LOCAL
+	thumb)
+		basic_machine=$basic_machine-unknown
 		;;
-	# 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
-		basic_machine=sparc64-sun
-		os=-elf
+# start-sanitize-vr4xxx
+	mips64vr4xxx | mips64vr4xxxel)
+		basic_machine=$basic_machine-unknown
 		;;
-	sparc64-*)					# CYGNUS LOCAL
+# end-sanitize-vr4xxx
+# start-sanitize-vr4320
+	mips64vr4320 | mips64vr4320el)
+		basic_machine=$basic_machine-unknown
 		;;
-# end-sanitize-v9
-
-	mips3-*)					# CYGNUS LOCAL
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+# end-sanitize-vr4320
+	mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith/vr4300
+		basic_machine=$basic_machine-unknown
 		;;
-	mips3)						# CYGNUS LOCAL
-		basic_machine=mips64-unknown
+	mips64vr4100 | mips64vr4100el) # CYGNUS LOCAL jsmith/vr4100
+		basic_machine=$basic_machine-unknown
 		;;
-	dpx20 | dpx20-*)				# CYGNUS LOCAL
-		basic_machine=rs6000-bull
-		os=-bosx
+	mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
+		basic_machine=$basic_machine-unknown
 		;;
-	unixware)					# CYGNUS LOCAL
-		os=-sysv4
-		basic_machine=i386-unknown
+# start-sanitize-cygnus
+	mips64vr5400)			 # CYGNUS LOCAL cagney/vr5400
+		basic_machine=$basic_machine-unknown
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+# end-sanitize-cygnus
+# start-sanitize-tx19
+        mipstx19 | mipstx19el)
+                basic_machine=$basic_machine-unknown
+                ;;
+# end-sanitize-tx19
+# start-sanitize-tx49
+	mips64tx49 | mips64tx49el)
+		basic_machine=$basic_machine-unknown
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+# end-sanitize-tx49
+# start-sanitize-r5900
+	mips64r5900 | mips64r5900el) # CYGNUS LOCAL gavin/r5900
+		basic_machine=$basic_machine-unknown
 		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
+# end-sanitize-r5900
+	mips16)
+		basic_machine=$basic_machine-unknown
 		;;
-	i386mach)					# CYGNUS LOCAL
-		basic_machine=i386-mach
-		os=-mach
+	tic30) # CYGNUS LOCAL ian/tic30
+		basic_machine=$basic_machine-unknown
 		;;
-	i[34]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv32
+	c30) # CYGNUS LOCAL ian/tic30
+		basic_machine=tic30-unknown
 		;;
-	i[34]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv4
+
+# start-sanitize-tic80
+	tic80)				# CYGNUS LOCAL fnf/TIc80
+		basic_machine=$basic_machine-unknown
 		;;
-	i[34]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv
+# end-sanitize-tic80
+# start-sanitize-sky
+	dvp)
+		basic_machine=$basic_machine-unknown
 		;;
-	i[34]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-solaris2
+# end-sanitize-sky
+	v850e)				# CYGNUS LOCAL jtc/v850
+		basic_machine=$basic_machine-unknown
 		;;
-	vsta | i386-vsta)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-vsta
+	v850ea)				# CYGNUS LOCAL jtc/v850
+		basic_machine=$basic_machine-unknown
 		;;
-	go32 | i386-go32)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-go32
+	d10v)
+		basic_machine=$basic_machine-unknown
 		;;
-	i386-linux* | linux)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linux
+	d30v)				# CYGNUS LOCAL hunt/d30v
+		basic_machine=$basic_machine-unknown
 		;;
-	i386-linux*coff | linuxcoff)			# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linuxcoff
+	# 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[34567]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
 		;;
-	i386-linux*elf | linuxelf)			# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linuxelf
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[34567]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-* \
+	      | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
+	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
+	      | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-* \
+	      | fr30-*) # CYGNUS LOCAL
+		;;
+	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
+	        ;;
+	v850e-*) # CYGNUS LOCAL
+	        ;;
+	v850ea-*) # CYGNUS LOCAL
+	        ;;
+	d30v-*) # CYGNUS LOCAL
+	        ;;
+# start-sanitize-vr4xxx
+	mips64vr4xxx-* | mips64vr4xxxel-*)
+		;;
+# end-sanitize-vr4xxx
+# start-sanitize-vr4320
+	mips64vr4320-* | mips64vr4320el-*)
+		;;
+# end-sanitize-vr4320
+	mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith/vr4300
+		;;
+	mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
+		;;
+# 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
 		;;
-	netbsd386)
-		basic_machine=i386-unknown		# CYGNUS LOCAL
-		os=-netbsd
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
 		;;
-	spur)
-		basic_machine=spur-unknown
+	3b*)
+		basic_machine=we32k-att
 		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
+	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
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	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
@@ -276,16 +449,47 @@ case $basic_machine in
 		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
 		;;
+	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
@@ -293,11 +497,142 @@ case $basic_machine in
 	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
 		;;
-	iris | iris4d | \
-	iris3 | iris4)					# CYGNUS LOCAL
+	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
+                ;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	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[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]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*)
@@ -307,289 +642,299 @@ case $basic_machine in
 			;;
 		esac
 		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
 		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+	m88k-omron*)
+		basic_machine=m88k-omron
 		;;
-	3b*)
-		basic_machine=we32k-att
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
 		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
 		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
+	miniframe)
+		basic_machine=m68000-convergent
 		;;
-        pc532)
-		basic_machine=ns32k-pc532
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	monitor)					# CYGNUS LOCAL
+		basic_machine=m68k-rom68k
+		os=-coff
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	msdos)						# CYGNUS LOCAL
+		basic_machine=i386-unknown	
+		os=-msdos
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	netbsd386)
+		basic_machine=i386-unknown		# CYGNUS LOCAL
+		os=-netbsd
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
 		;;
-	sun4sol2)					# CYGNUS LOCAL
-		basic_machine=sparc-sun
-		os=-solaris2
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
 		;;
-	z8ksim)						# CYGNUS LOCAL
-		basic_machine=z8k-zilog
-		os=-sim
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
 		;;
-	z8k)						# CYGNUS LOCAL
-		basic_machine=z8k-zilog
+	necv70)						# CYGNUS LOCAL
+		basic_machine=v70-nec
+		os=-sysv
 		;;
-	sun3)
-		basic_machine=m68k-sun
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
 		;;
-	msdos)						# CYGNUS LOCAL
-		basic_machine=i386-unknown	
-		os=-msdos
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
 		;;
-	pbd)
-		basic_machine=sparc-tti
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
 		;;
-	pbb)
-		basic_machine=m68k-tti
+	mon960)						# CYGNUS LOCAL
+		basic_machine=i960-intel
+		os=-mon960
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	np1)
+		basic_machine=np1-gould
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	OSE68000 | ose68000)				# CYGNUS LOCAL
+		basic_machine=m68000-ericsson
+		os=-ose
 		;;
-	fx2800)
-		basic_machine=i860-alliant
+	os68k)						# CYGNUS LOCAL
+		basic_machine=m68k-none
+		os=-os68k
 		;;
-	next)
-		basic_machine=m68k-next
-		os=-bsd
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	amiga)
-		basic_machine=m68k-cbm
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
 		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
+	pbd)
+		basic_machine=sparc-tti
 		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
+	pbb)
+		basic_machine=m68k-tti
 		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
 		;;
-	hp9k31[0-9] | hp9k2[0-9][0-9])
-		basic_machine=m68000-hp
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-		basic_machine=hppa1.1-hp
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
+	pentiumii | pentium2)
+		basic_machine=i786-pc
 		;;
-	h3050r* | hppahitachi)
-		basic_machine=hppa1.1-hitachi
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	apollo68bsd)					# CYGNUS LOCAL
-		basic_machine=m68k-apollo
-		os=-bsd
+	pn)
+		basic_machine=pn-gould
 		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
+	power)	basic_machine=rs6000-ibm
 		;;
-	miniframe)
-		basic_machine=m68010-convergent
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
+	ps2)
+		basic_machine=i386-ibm
 		;;
-	st2000)						# CYGNUS LOCAL
-		basic_machine=m68k-tandem
+# start-sanitize-tx19
+	r1900)
+		basic_machine=mipstx19-unknown
 		;;
-        m6*bug)                                           # CYGNUS LOCAL
-                basic_machine=m68k-bug
-		os=-coff
-                ;;
-        rom68k)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
-		os=-coff
+	r1900el)
+		basic_machine=mipstx19el-unknown
+		;;
+# end-sanitize-tx19
+# start-sanitize-r5900
+        r5900 | r5900el)                                # CYGNUS LOCAL
+                basic_machine=mips64r5900-unknown
                 ;;
-        monitor)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
+# end-sanitize-r5900
+	rom68k)						# CYGNUS LOCAL
+		basic_machine=m68k-rom68k
 		os=-coff
-                ;;
-	decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
 		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
+	rm[46]00)
+		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
+	sa29200)					# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	stratus)					# CYGNUS LOCAL
-		basic_machine=i860-stratus
-		os=-sysv4
+	sequent)
+		basic_machine=i386-sequent
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	sparclite-wrs)					# CYGNUS LOCAL
+		basic_machine=sparclite-wrs
+		os=-vxworks
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
 		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
+	spur)
+		basic_machine=spur-unknown
 		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
+	st2000)						# CYGNUS LOCAL
+		basic_machine=m68k-tandem
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+	stratus)					# CYGNUS LOCAL
+		basic_machine=i860-stratus
+		os=-sysv4
 		;;
-	h8300hms)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-hms
+	sun2)
+		basic_machine=m68000-sun
 		;;
-	sh*)						# CYGNUS LOCAL
-		basic_machine=sh-hitachi
-		os=-hms
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
 		;;
-
-	h8500hms)					# CYGNUS LOCAL
-		basic_machine=h8500-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=-sysv3
+	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
 		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
+# start-sanitize-tx19
+	tx19)
+		basic_machine=mipstx19-unknown
 		;;
-	necv70)						# CYGNUS LOCAL
-		basic_machine=v70-nec
-		os=-sysv
+	tx19el)
+		basic_machine=mipstx19el-unknown
 		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+# end-sanitize-tx19
+	tx39)
+		basic_machine=mipstx39-unknown
 		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
+	tx39el)
+		basic_machine=mipstx39el-unknown
 		;;
-	pn)
-		basic_machine=pn-gould
+	tower | tower-32)
+		basic_machine=m68k-ncr
 		;;
-	np1)
-		basic_machine=np1-gould
+	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
@@ -598,46 +943,25 @@ case $basic_machine in
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)		# 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-wrs)					# CYGNUS LOCAL
-		basic_machine=sparclite-wrs
+	vxworks29k)
+		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
-	sparcfrw)					# CYGNUS LOCAL
-		basic_machine=sparcfrw-sun
-		os=-sunos4
-		;;
-	sparcfrwcompat)					# CYGNUS LOCAL
-		basic_machine=sparcfrwcompat-sun
-		os=-sunos4
-		;;
-	sparclitefrw)					# CYGNUS LOCAL
-		basic_machine=sparclitefrw-fujitsu
-		os=-none
-		;;
-	sparclitefrwcompat)				# CYGNUS LOCAL
-		basic_machine=sparclitefrwcompat-fujitsu
-		os=-none
+	w65*)						# CYGNUS LOCAL
+ 		basic_machine=w65-wdc
+ 		os=-none
 		;;
-	adobe68k)					# CYGNUS LOCAL
-		basic_machine=m68010-adobe
-		os=-scout
+	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
@@ -645,8 +969,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.
+	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)
-		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
@@ -657,10 +994,13 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -672,14 +1012,16 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
-## start-sanitize-mpw
-	mac)						# CYGNUS LOCAL
+	mac | mpw | mac-mpw)				# CYGNUS LOCAL
 		basic_machine=m68k-apple
 		;;
-	mpw)						# CYGNUS LOCAL
-		basic_machine=m68k-apple
+	pmac | pmac-mpw)				# CYGNUS LOCAL
+		basic_machine=powerpc-apple
 		;;
-## end-sanitize-mpw
+ 	c4x*)
+ 		basic_machine=c4x-none
+ 		os=-coff
+  		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -703,6 +1045,8 @@ esac
 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|'`
@@ -710,22 +1054,46 @@ case $os in
 	-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.
-	# Each alternative must end in a *, to match a version number.
+	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \
-	      | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -riscix* | -lynxos* \
-	      | -go32 | -vsta | -sim | -es1800* | -udi | -hms* | -xray | -hds* \
-	      | -os68k* | -none* | -v88r* | -aout* | -coff | -elf* | -bosx* \
-	      | -abug | -ecoff* | -netware* | -os9* )
-				# The last three lines above are CYGNUS LOCAL
-	;;
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -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* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk*)
+	# 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|'`
 		;;
@@ -753,6 +1121,16 @@ case $os in
 	-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
 		;;
@@ -762,9 +1140,6 @@ case $os in
 	-svr4)
 		os=-sysv4
 		;;
-	-unixware)
-		os=-sysv4
-		;;
 	-svr3)
 		os=-sysv3
 		;;
@@ -787,7 +1162,7 @@ case $os in
 		;;
 	*)
 		# 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
 		;;
@@ -808,9 +1183,18 @@ 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
 		;;
@@ -820,21 +1204,36 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
-	m68*-cisco)
+	m68*-cisco)					# CYGNUS LOCAL
 		os=-aout
 		;;
-	mips*-cisco)
+	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)
+		os=-beos
+		;;
 	*-ibm)
 		os=-aix
 		;;
+	*-wec)						# CYGNUS LOCAL
+		os=-proelf
+		;;
+	*-winbond)					# CYGNUS LOCAL
+		os=-proelf
+		;;
+	*-oki)						# CYGNUS LOCAL
+		os=-proelf
+		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -845,7 +1244,7 @@ case $basic_machine in
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigados
+		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux
@@ -853,11 +1252,17 @@ case $basic_machine in
 	*-dolphin)
 		os=-sysv3
 		;;
+	m68k-ccur)
+		os=-rtu
+		;;
 	m88k-omron*)
 		os=-luna
 		;;
+	*-next )
+		os=-nextstep
+		;;
 	*-sequent)
-		os=-bsd
+		os=-ptx
 		;;
 	*-crds)
 		os=-unos
@@ -869,10 +1274,7 @@ case $basic_machine in
 		os=-mvs
 		;;
 	*-next)
-		os=-bsd
-		;;
-	i[34]86-*)
-		os=-sco3.2v2
+		os=-nextstep3
 		;;
         *-gould)
 		os=-sysv
@@ -886,20 +1288,24 @@ case $basic_machine in
         *-sgi)
 		os=-irix
 		;;
+        *-siemens)
+		os=-sysv4
+		;;
 	*-masscomp)
 		os=-rtu
 		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
 	*-rom68k)					# CYGNUS LOCAL
 		os=-coff
 		;;
 	*-*bug)						# CYGNUS LOCAL
 		os=-coff
 		;;
-## start-sanitize-mpw
 	*-apple)					# CYGNUS LOCAL
-		os=-mpw
+		os=-macos
 		;;
-## end-sanitize-mpw
 	*)
 		os=-none
 		;;
@@ -918,18 +1324,18 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-bosx*)			# CYGNUS LOCAL
-				vendor=bull
-				;;
-			-lynxos*)
-				vendor=lynx
-				;;
 			-aix*)
 				vendor=ibm
 				;;
+			-beos*)
+				vendor=be
+				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-mpeix*)
+				vendor=hp
+				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -948,17 +1354,21 @@ case $basic_machine in
 			-mvs*)
 				vendor=ibm
 				;;
-			-vxworks*)
-				vendor=wrs		# CYGNUS LOCAL
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
 				;;
 			-hms*)				# CYGNUS LOCAL
 				vendor=hitachi
 				;;
-## start-sanitize-mpw
-			-mpw*)				# CYGNUS LOCAL
+			-mpw* | -macos*)		# CYGNUS LOCAL
 				vendor=apple
 				;;
-## end-sanitize-mpw
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;