* config.sub (case $basic_machine): Re-order the cases, to match

	the order in the FSF version (which is mostly alphabethical).
	Merge in some additions and changes from the FSF.

1 files changed, 350 insertions, 318 deletions

diff --git a/config.sub b/config.sub
index 97e1a3b554..3275aa4bc4 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993 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. 
@@ -164,96 +164,64 @@ case $basic_machine in
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	sparc64)					# CYGNUS LOCAL
-		basic_machine=sparc64-sun
-		os=-elf
+	386bsd)						# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-bsd
 		;;
-	sparc64-*)					# CYGNUS LOCAL
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
 		;;
-
-	mips3-*)					# CYGNUS LOCAL
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+	3b*)
+		basic_machine=we32k-att
 		;;
-	mips3)						# CYGNUS LOCAL
-		basic_machine=mips64-unknown
+	a29khif)					# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	dpx20 | dpx20-*)				# CYGNUS LOCAL
-		basic_machine=rs6000-bull
-		os=-bosx
+	adobe68k)					# CYGNUS LOCAL
+		basic_machine=m68010-adobe
+		os=-scout
 		;;
-	unixware)					# CYGNUS LOCAL
-		os=-sysv4
-		basic_machine=i386-unknown
+	alliant | fx80)
+		basic_machine=fx80-alliant
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	altos | altos3068)
+		basic_machine=m68k-altos
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
 		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
 		;;
-	i386mach)					# CYGNUS LOCAL
-		basic_machine=i386-mach
-		os=-mach
+	amiga)
+		basic_machine=m68k-cbm
 		;;
-	i[34]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv32
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
 		;;
-	i[34]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	amigaunix | amix)
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
-	i[34]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	apollo68)
+		basic_machine=m68k-apollo
 		os=-sysv
 		;;
-	i[34]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-solaris2
-		;;
-	vsta | i386-vsta)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	go32 | i386-go32)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-linux* | linux)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linux
-		;;
-	i386-linux*coff | linuxcoff)			# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linuxcoff
-		;;
-	i386-linux*elf | linuxelf)			# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-linuxelf
-		;;
-	386bsd)						# CYGNUS LOCAL
-		basic_machine=i386-unknown
+	apollo68bsd)					# CYGNUS LOCAL
+		basic_machine=m68k-apollo
 		os=-bsd
 		;;
-	netbsd386)
-		basic_machine=i386-unknown		# CYGNUS LOCAL
-		os=-netbsd
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
+	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
@@ -275,341 +243,302 @@ 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
-		;;
-	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-zilog
-		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
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
 		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k31[0-9] | hp9k2[0-9][0-9])
-		basic_machine=m68000-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
 		;;
-	h3050r* | hppahitachi)
-		basic_machine=hppa1.1-hitachi
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
 		;;
-	apollo68)
-		basic_machine=m68k-apollo
+	i386mach)					# CYGNUS LOCAL
+		basic_machine=i386-mach
+		os=-mach
+		;;
+# 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
+		;;
+	i[34]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-sysv4
+		;;
+	i[34]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv
 		;;
-	apollo68bsd)					# CYGNUS LOCAL
-		basic_machine=m68k-apollo
-		os=-bsd
+	i[34]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-solaris2
 		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
+	i386-linux* | linux)				# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linux
 		;;
-	miniframe)
-		basic_machine=m68010-convergent
+	i386-linux*coff | linuxcoff)			# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linuxcoff
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	i386-linux*elf | linuxelf)			# CYGNUS LOCAL
+		basic_machine=i386-unknown
+		os=-linuxelf
 		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
+	iris | iris4d | \
+	iris3 | iris4)					# CYGNUS LOCAL
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
 		;;
-	st2000)						# CYGNUS LOCAL
-		basic_machine=m68k-tandem
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
 		;;
         m6*bug)                                           # CYGNUS LOCAL
                 basic_machine=m68k-bug
 		os=-coff
                 ;;
-        rom68k)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
-		os=-coff
-                ;;
-        monitor)                                         # CYGNUS LOCAL
-                basic_machine=m68k-rom68k
-		os=-coff
-                ;;
-	decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+	m88k-omron*)
+		basic_machine=m88k-omron
 		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
 		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
+	merlin)
+		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	stratus)					# CYGNUS LOCAL
-		basic_machine=i860-stratus
-		os=-sysv4
+	miniframe)
+		basic_machine=m68010-convergent
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	mips3-*)					# CYGNUS LOCAL
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	mips3)						# CYGNUS LOCAL
+		basic_machine=mips64-unknown
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+        monitor)                                         # CYGNUS LOCAL
+                basic_machine=m68k-rom68k
+		os=-coff
+                ;;
+	msdos)						# CYGNUS LOCAL
+		basic_machine=i386-unknown	
+		os=-msdos
 		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
 		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
+	necv70)						# CYGNUS LOCAL
+		basic_machine=v70-nec
+		os=-sysv
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+	netbsd386)
+		basic_machine=i386-unknown		# CYGNUS LOCAL
+		os=-netbsd
 		;;
-	h8300hms)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-hms
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
 		;;
-	sh*)						# CYGNUS LOCAL
-		basic_machine=sh-hitachi
-		os=-hms
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
 		;;
-
-	h8500hms)					# CYGNUS LOCAL
-		basic_machine=h8500-hitachi
-		os=-hms
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
 		;;
-	h8300xray)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-xray
+	next)
+		basic_machine=m68k-next
+		case $os in
+		    -ns2*)
+			;;
+		    *)
+		      os=-ns3
+			;;
+		esac
 		;;
-	h8300hds)
-		basic_machine=h8300-hitachi
-		os=-hds
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
 		;;
-	udi29k)						# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
 		;;
-	a29khif)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
 		;;
-	sa29200)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
+	np1)
+		basic_machine=np1-gould
 		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
+	os68k)						# CYGNUS LOCAL
+		basic_machine=m68k-none
+		os=-os68k
 		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
+	OSE68000 | ose68000)				# CYGNUS LOCAL
+		basic_machine=m68000-ericsson
+		os=-ose
 		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
+	paragon)
+		basic_machine=i860-intel
 		os=-osf
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	necv70)						# CYGNUS LOCAL
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	pbd)
+		basic_machine=sparc-tti
 		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	pbb)
+		basic_machine=m68k-tti
 		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
+        pc532)
+		basic_machine=ns32k-pc532
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	ps2)
+		basic_machine=i386-ibm
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+        rom68k)                                         # CYGNUS LOCAL
+                basic_machine=m68k-rom68k
+		os=-coff
+                ;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	sa29200)					# CYGNUS LOCAL
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)		# CYGNUS LOCAL
-		basic_machine=m68k-ericsson
-		os=-ose
+	sh*)						# CYGNUS LOCAL
+		basic_machine=sh-hitachi
+		os=-hms
 		;;
-	OSE68000 | ose68000)				# CYGNUS LOCAL
-		basic_machine=m68000-ericsson
-		os=-ose
+	sparc64)					# CYGNUS LOCAL
+		basic_machine=sparc64-sun
+		os=-elf
 		;;
-	os68k)						# CYGNUS LOCAL
-		basic_machine=m68k-none
-		os=-os68k
+	sparc64-*)					# CYGNUS LOCAL
 		;;
+
 	sparclite-wrs)					# CYGNUS LOCAL
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -628,14 +557,114 @@ case $basic_machine in
 	sparclitefrwcompat)				# CYGNUS LOCAL
 		basic_machine=sparclitefrwcompat-fujitsu
 		;;
-	adobe68k)					# CYGNUS LOCAL
-		basic_machine=m68010-adobe
-		os=-scout
+	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
+		;;
+	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
@@ -778,6 +807,9 @@ case $os in
 	-es1800*)					# CYGNUS LOCAL
 		os=-ose
 		;;
+	-cxux7*)
+		os=-cxux7
+		;;
 	-xenix)
 		os=-xenix
 		;;