X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=config.sub;h=6330f7dd9a45c2641f548743c1980ca849e36ef3;hb=3b21918aa62d47f1937f1d6488872097203428b4;hp=ece3a164462a6d5da45ceff77f0ebbb32596f573;hpb=3c52e52d2ca80aa38655ea3dc5f4796d47e0c052;p=deliverable%2Fbinutils-gdb.git

diff --git a/config.sub b/config.sub
index ece3a16446..6330f7dd9a 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can. 
@@ -36,7 +36,7 @@
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# it is wrong to echo any other type of specification
+# It is wrong to echo any other type of specification.
 
 if [ x$1 = x ]
 then
@@ -63,162 +63,165 @@ if [ $basic_machine != $1 ]
 then os=`echo $1 | sed 's/.*-/-/'`
 else os=; fi
 
-# Lets recognize common machines as not being OS so that things like
-# config.sub decstation-3100 work.
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
 case $os in
+	-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* | \
+	-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 | \
-	-sim)						# CYGNUS LOCAL
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-sim | -cisco)						# CYGNUS LOCAL
 		os=
 		basic_machine=$1
 		;;
 	-scout)						# CYGNUS LOCAL
 		;;
+	-wrs)						# CYGNUS LOCAL
+		os=vxworks
+		basic_machine=$1
+		;;
+	-unixware)					# CYGNUS LOCAL
+		os=-sysv4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		;;
+	-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/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
-	-isc*)
-		os=-isc
-		basic_machine=i386-unknown
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
-	-OSE68k | -ose68k | -OSE | -ose | -es1800)	# CYGNUS LOCAL
-		os=-ose
-		basic_machine=m68k-ericsson
+	-clix*)
+		basic_machine=clipper-intergraph
 		;;
-	-OSE68000 | -ose68000)				# CYGNUS LOCAL
-		os=-ose
-		basic_machine=m68000-ericsson
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
-# start-sanitize-v9
-	-32)						# CYGNUS LOCAL
-		basic_machine=sparc64-hal
-		os=-hal32
+	-lynx*)
+		os=-lynxos
 		;;
-	-64)						# CYGNUS LOCAL
-		basic_machine=sparc64-hal
-		os=-hal64
+	-os9k)
+		os=-os9k
 		;;
-	-v7)						# CYGNUS LOCAL
-		basic_machine=sparc64-sun
-		os=-v7
+	-os9)
+		os=-os9
 		;;
-# end-sanitize-v9	
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-	# Recognize the basic CPU types with without company name.
+	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
 	tahoe | i[34]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
-		| alpha | we32k | sparc \
-		| m680[01234]0 | m683?2 | z8k | v70)	# CYGNUS LOCAL
+		| tron | a29k | 580 | i960 | hppa1.0 | hppa1.1 \
+		| alpha | we32k | ns16k | clipper | sparclite | i370 \
+		| powerpc \
+		| h8300 | h8300h | sh \
+		| m88110 | sparc | m680[01234]0 | m683?2 | z8k | v70 \
+		| v810 \
+		| h8500 | mips64 | mipsel | mips64el) # CYGNUS LOCAL
 		basic_machine=$basic_machine-unknown
 		;;
-	# Recognize the basic CPU types with with company name.
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
 	vax-* | tahoe-* | i[34]86-* | i860-* | m68k-* | m68000-* | m88k-* \
 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* \
-	      | m680[01234]0-* | m683?2-* | z8k-*)	# CYGNUS LOCAL
+	      | 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
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-# start-sanitize-v9
-	sparc64-*) ;;					# CYGNUS LOCAL
-	hal-32 | hal32)					# CYGNUS LOCAL
-		basic_machine=sparc64-hal
-		os=-hal32
-		;;
-	hal-64 | hal64)					# CYGNUS LOCAL
-		basic_machine=sparc64-hal
-		os=-hal64
-		;;
-	sparc64)					# CYGNUS LOCAL
-		basic_machine=sparc64-sun
-		os=-v9
-		;;
-	sparc64-v7 | sparc64v7)				# CYGNUS LOCAL
-		basic_machine=sparc64-sun
-		os=-v7
-		;;
-# end-sanitize-v9
-
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	386bsd)						# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-bsd
 		;;
-	i386mach)					# CYGNUS LOCAL
-		basic_machine=i386-mach
-		os=-mach
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
 		;;
-	i386v32)
-		basic_machine=i386-unknown
-		os=-sysv32
+	3b*)
+		basic_machine=we32k-att
 		;;
-	i386-sco* | i386sco | sco)
-		basic_machine=i386-unknown
-		os=-sco3.2v2
+	a29khif)					# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	go32 | i386-go32)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-go32
+	adobe68k)					# CYGNUS LOCAL
+		basic_machine=m68010-adobe
+		os=-scout
 		;;
-	i386-isc* | isc)
-		basic_machine=i386-unknown
-		os=-isc
+	alliant | fx80)
+		basic_machine=fx80-alliant
 		;;
-	i386-linux* | linux)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linux
+	altos | altos3068)
+		basic_machine=m68k-altos
 		;;
-	i486v32)
-		basic_machine=i486-unknown
-		os=-sysv32
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
 		;;
-	i486-sco* | i486sco | sco)
-		basic_machine=i486-unknown
-		os=-sco3.2v2
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
 		;;
-	i486-isc* | isc)
-		basic_machine=i486-unknown
-		os=-isc
+	amiga)
+		basic_machine=m68k-cbm
 		;;
-	i386v4*)
-		basic_machine=i386-unknown
-		os=-sysv4
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
 		;;
-	i486v4*)
-		basic_machine=i486-unknown
+	amigaunix | amix)
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
-	i386v)
-		basic_machine=i386-unknown
-		os=-sysv
-		;;
-	i486v)
-		basic_machine=i486-unknown
+	apollo68)
+		basic_machine=m68k-apollo
 		os=-sysv
 		;;
-	386bsd)						# CYGNUS LOCAL
-		basic_machine=i386-unknown
+	apollo68bsd)					# CYGNUS LOCAL
+		basic_machine=m68k-apollo
 		os=-bsd
 		;;
-	spur)
-		basic_machine=spur-unknown
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
 		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
+	m68k-ccur)
+		basic_machine=m68k-ccur
+		os=-rtu
 		;;
 	convex-c1)
 		basic_machine=c1-convex
@@ -240,272 +243,199 @@ 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
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		os=-bsd
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	iris | iris4d | \
-	iris3 | iris4)					# CYGNUS LOCAL
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
+	decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
 		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-        pc532)
-		basic_machine=ns32k-pc532
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	es1800 | OSE68k | ose68k | ose | OSE)		# CYGNUS LOCAL
+		basic_machine=m68k-ericsson
+		os=-ose
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	fx2800)
+		basic_machine=i860-alliant
 		;;
-	sun4sol2)					# CYGNUS LOCAL
-		basic_machine=sparc-sun
-		os=-solaris2
+	genix)
+		basic_machine=ns32k-ns
 		;;
-	z8ksim)						# CYGNUS LOCAL
-		basic_machine=z8k-unknown
-		os=-sim
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
 		;;
-	sun3)
-		basic_machine=m68k-sun
+	go32 | i386-go32)				# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-go32
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	msdos)						# CYGNUS LOCAL
-		basic_machine=i386-unknown	
-		os=-msdos
+	h8300hds)
+		basic_machine=h8300-hitachi
+		os=-hds
 		;;
-	pbd)
-		basic_machine=sparc-tti
+	h8300hms)					# CYGNUS LOCAL
+		basic_machine=h8300-hitachi
+		os=-hms
 		;;
-	pbb)
-		basic_machine=m68k-tti
+	h8300xray)					# CYGNUS LOCAL
+		basic_machine=h8300-hitachi
+		os=-xray
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	h8500hms)					# CYGNUS LOCAL
+		basic_machine=h8500-hitachi
+		os=-hms
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
 		;;
-	fx2800)
-		basic_machine=i860-alliant
+	h3050r* | hppahitachi)
+		basic_machine=hppa1.1-hitachi
 		;;
-	next)
-		basic_machine=m68k-next
+	hp300bsd)
+		basic_machine=m68k-hp
 		os=-bsd
 		;;
-	amiga)
-		basic_machine=m68k-cbm
-		;;
-	hp9k3[2-9][0-9])
+	hp300hpux)
 		basic_machine=m68k-hp
+		os=-hpux
 		;;
-	hp9k31[0-9] | hp9k2[0-9][0-9])
+	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
 	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)					# CYGNUS LOCAL
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	st2000)						# CYGNUS LOCAL
-		basic_machine=m68k-tandem
-		;;
-	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
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
 		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
+	i386mach)					# CYGNUS LOCAL
+		basic_machine=i386-mach
+		os=-mach
 		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-sysv32
 		;;
-	stratus)					# CYGNUS LOCAL
-		basic_machine=i860-stratus
+	i[34]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv4
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-m88kbcs
-		;;
-	dpx2)
-		basic_machine=m68k-bull
+	i[34]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+	i[34]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-solaris2
 		;;
-
-	h8300hms)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-hms
+	i386-linux* | linux)				# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linux
 		;;
-	h8300xray)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-xray
+	i386-linux*coff | linuxcoff)			# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linuxcoff
 		;;
-	h8300hds)
-		basic_machine=h8300-hitachi
-		os=-hds
+	i386-linux*elf | linuxelf)			# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linuxelf
 		;;
-	udi29k)						# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+	iris | iris4d | \
+	iris3 | iris4)					# CYGNUS LOCAL
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
 		;;
-	a29khif)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
 		;;
-	sa29200)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+        m6*bug)                                           # CYGNUS LOCAL
+                basic_machine=m68k-bug
+		os=-coff
+                ;;
+	m88k-omron*)
+		basic_machine=m88k-omron
 		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-m88kbcs
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
 		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
 		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+	miniframe)
+		basic_machine=m68010-convergent
 		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		os=-hpux
+	mips3-*)					# CYGNUS LOCAL
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		os=-hpux
+	mips3)						# CYGNUS LOCAL
+		basic_machine=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
@@ -515,50 +445,100 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
+	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
+		;;
+	next)
+		basic_machine=m68k-next
+		case $os in
+		    -ns2* | -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
 		;;
-	pn)
-		basic_machine=pn-gould
-		os=-sysv
-		;;
 	np1)
 		basic_machine=np1-gould
-		os=-sysv
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
 		;;
-	es1800 | OSE68k | ose68k)			# CYGNUS LOCAL
-		basic_machine=m68k-ericsson
-		os=-ose
+	os68k)						# CYGNUS LOCAL
+		basic_machine=m68k-none
+		os=-os68k
 		;;
 	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
 		;;
-	sparclite)					# CYGNUS LOCAL
-		basic_machine=sparclite-fujitsu
-		os=-none
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532)
+		basic_machine=ns32k-pc532
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+        rom68k)                                         # CYGNUS LOCAL
+                basic_machine=m68k-rom68k
+		os=-coff
+                ;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sa29200)					# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sh*)						# CYGNUS LOCAL
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sparc64)					# CYGNUS LOCAL
+		basic_machine=sparc64-sun
+		os=-elf
 		;;
+	sparc64-*)					# CYGNUS LOCAL
+		;;
+
 	sparclite-wrs)					# CYGNUS LOCAL
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -573,17 +553,118 @@ case $basic_machine in
 		;;
 	sparclitefrw)					# CYGNUS LOCAL
 		basic_machine=sparclitefrw-fujitsu
-		os=-none
 		;;
 	sparclitefrwcompat)				# CYGNUS LOCAL
 		basic_machine=sparclitefrwcompat-fujitsu
+		;;
+	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)					# CYGNUS LOCAL
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)						# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	unixware)					# CYGNUS LOCAL
+		os=-sysv4
+		basic_machine=i386-unknown
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
 		os=-none
 		;;
-	adobe68k)					# CYGNUS LOCAL
-		basic_machine=m68010-adobe
-		os=-scout
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vsta | i386-vsta)				# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	z8ksim)						# CYGNUS LOCAL
+		basic_machine=z8k-zilog
+		os=-sim
 		;;
-
 	none)
 		basic_machine=none-none
 		os=-none
@@ -606,6 +687,26 @@ case $basic_machine in
 	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
+		;;
+## start-sanitize-mpw
+	mac)						# CYGNUS LOCAL
+		basic_machine=m68k-apple
+		;;
+	mpw)						# CYGNUS LOCAL
+		basic_machine=m68k-apple
+		;;
+## end-sanitize-mpw
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -626,26 +727,38 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ "$os" ]
+if [ x"$os" != x"" ]
 then
 case $os in
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative must end in a *, to match a version number.
-	-bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \
+	# -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* | -hds* | -m88kbcs* \
-	      | -riscos* | -linux* \
-	      | -go32 | -linux* | -sim | -es1800* | -udi | -hms* | -xray \
-	      | -os68k* | -none* | -v88r* | -aout | -coff | -elf)
-				# The last two lines above are CYGNUS LOCAL
+	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
+	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -nextstep | -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
 	;;
-# start-sanitize-v9
-	-v7 | -v9 | -hal32 | -hal64) ;;			# CYGNUS LOCAL
-# end-sanitize-v9
-
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -676,15 +789,30 @@ case $os in
 	-svr4)
 		os=-sysv4
 		;;
+	-unixware)
+		os=-sysv4
+		;;
 	-svr3)
 		os=-sysv3
 		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
 	-ose*)						# CYGNUS LOCAL
 		os=-ose
 		;;
 	-es1800*)					# CYGNUS LOCAL
 		os=-ose
 		;;
+	-cxux7*)
+		os=-cxux7
+		;;
+	-xenix)
+		os=-xenix
+		;;
 	-none)
 		;;
 	*)
@@ -699,7 +827,17 @@ else
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
 case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
 	*-dec | vax-*)
 		os=-ultrix4.2
 		;;
@@ -712,6 +850,12 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -724,7 +868,10 @@ case $basic_machine in
 	*-hp)
 		os=-hpux
 		;;
-	*-sgi | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 		os=-sysv
 		;;
 	*-cbm)
@@ -739,15 +886,50 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
+	*-sequent)
+		os=-bsd
+		;;
 	*-crds)
 		os=-unos
 		;;
 	*-ns)
 		os=-genix
 		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep
+		;;
 	i[34]86-*)
 		os=-sco3.2v2
 		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	*-rom68k)					# CYGNUS LOCAL
+		os=-coff
+		;;
+	*-*bug)						# CYGNUS LOCAL
+		os=-coff
+		;;
+## start-sanitize-mpw
+	*-apple)					# CYGNUS LOCAL
+		os=-mpw
+		;;
+## end-sanitize-mpw
 	*)
 		os=-none
 		;;
@@ -760,15 +942,27 @@ vendor=unknown
 case $basic_machine in
 	*-unknown)
 		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
 			-sunos*)
 				vendor=sun
 				;;
+			-bosx*)			# CYGNUS LOCAL
+				vendor=bull
+				;;
+			-lynxos*)
+				vendor=lynx
+				;;
 			-aix*)
 				vendor=ibm
 				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-hiux*)
+				vendor=hitachi
+				;;
 			-unos*)
 				vendor=crds
 				;;
@@ -781,9 +975,20 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-vxworks*)			# CYGNUS LOCAL
-				vendor=wrs
+			-mvs*)
+				vendor=ibm
+				;;
+			-vxworks*)
+				vendor=wrs		# CYGNUS LOCAL
+				;;
+			-hms*)				# CYGNUS LOCAL
+				vendor=hitachi
+				;;
+## start-sanitize-mpw
+			-mpw*)				# CYGNUS LOCAL
+				vendor=apple
 				;;
+## end-sanitize-mpw
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;