From 72cc6ae1d6326988d538202d6d6f8f8bdbf671b4 Mon Sep 17 00:00:00 2001
From: Richard Stallman <rms@gnu.org>
Date: Sun, 16 Jan 1994 19:30:01 +0000
Subject: [PATCH] Alphabetize the list of machine-name aliases. Add nh3000 and
 nh[45]000.

---
 config.sub     | 411 +++++++++++++++++++++++++------------------------
 lib/config.sub | 411 +++++++++++++++++++++++++------------------------
 2 files changed, 416 insertions(+), 406 deletions(-)

diff --git a/config.sub b/config.sub
index c036cf3d..d2839de6 100644
--- a/config.sub
+++ b/config.sub
@@ -129,46 +129,44 @@ case $basic_machine in
 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
 	      | sh-* | powerpc-*)
 		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	3b*)
+		basic_machine=we32k-att
 		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
+	alliant | fx80)
+		basic_machine=fx80-alliant
 		;;
-# 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
+	altos | altos3068)
+		basic_machine=m68k-altos
 		;;
-	i[34]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv4
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
 		;;
-	i[34]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	amdahl)
+		basic_machine=580-amdahl
 		os=-sysv
 		;;
-	i[34]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-solaris2
+	amiga)
+		basic_machine=m68k-cbm
 		;;
-	spur)
-		basic_machine=spur-unknown
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
 		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
 		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
 		;;
 	convex-c1)
 		basic_machine=c1-convex
@@ -190,126 +188,80 @@ 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)
-		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
-		;;
-	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
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
 		;;
-	sun3)
-		basic_machine=m68k-sun
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	fx2800)
+		basic_machine=i860-alliant
 		;;
-	pbd)
-		basic_machine=sparc-tti
+	genix)
+		basic_machine=ns32k-ns
 		;;
-	pbb)
-		basic_machine=m68k-tti
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
 		;;
-	fx2800)
-		basic_machine=i860-alliant
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
 		;;
-	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
+		os=-hpux
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
+		os=-hpux
 		;;
 	hp9k31[0-9] | hp9k2[0-9][0-9])
 		basic_machine=m68000-hp
@@ -320,135 +272,184 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
 		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
+# 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
+		;;
+	i[34]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
 		;;
 	isi68 | isi)
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	apollo68)
-		basic_machine=m68k-apollo
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
 		os=-sysv
 		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	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
 		;;
-	decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+	next)
+		basic_machine=m68k-next
+		os=-bsd
 		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
 		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
 		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
+	np1)
+		basic_machine=np1-gould
 		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	pbd)
+		basic_machine=sparc-tti
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	pbb)
+		basic_machine=m68k-tti
 		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
+        pc532)
+		basic_machine=ns32k-pc532
 		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
+	pn)
+		basic_machine=pn-gould
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
 		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+	spur)
+		basic_machine=spur-unknown
 		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
+	sun2)
+		basic_machine=m68000-sun
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
 		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
 		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
 		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
 		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		os=-hpux
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
 		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		os=-hpux
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
+	sun3)
+		basic_machine=m68k-sun
 		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	sun4)
+		basic_machine=sparc-sun
 		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
 		;;
-	pn)
-		basic_machine=pn-gould
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
-	np1)
-		basic_machine=np1-gould
+	tower | tower-32)
+		basic_machine=m68k-ncr
 		;;
 	ultra3)
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -457,6 +458,10 @@ case $basic_machine in
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
diff --git a/lib/config.sub b/lib/config.sub
index c036cf3d..d2839de6 100644
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -129,46 +129,44 @@ case $basic_machine in
 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
 	      | sh-* | powerpc-*)
 		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	3b*)
+		basic_machine=we32k-att
 		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
+	alliant | fx80)
+		basic_machine=fx80-alliant
 		;;
-# 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
+	altos | altos3068)
+		basic_machine=m68k-altos
 		;;
-	i[34]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-sysv4
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
 		;;
-	i[34]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	amdahl)
+		basic_machine=580-amdahl
 		os=-sysv
 		;;
-	i[34]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
-		os=-solaris2
+	amiga)
+		basic_machine=m68k-cbm
 		;;
-	spur)
-		basic_machine=spur-unknown
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
 		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
 		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
 		;;
 	convex-c1)
 		basic_machine=c1-convex
@@ -190,126 +188,80 @@ 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)
-		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
-		;;
-	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
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
 		;;
-	sun3)
-		basic_machine=m68k-sun
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	fx2800)
+		basic_machine=i860-alliant
 		;;
-	pbd)
-		basic_machine=sparc-tti
+	genix)
+		basic_machine=ns32k-ns
 		;;
-	pbb)
-		basic_machine=m68k-tti
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
 		;;
-	fx2800)
-		basic_machine=i860-alliant
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
 		;;
-	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
+		os=-hpux
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
+		os=-hpux
 		;;
 	hp9k31[0-9] | hp9k2[0-9][0-9])
 		basic_machine=m68000-hp
@@ -320,135 +272,184 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
 		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
+# 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
+		;;
+	i[34]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
 		;;
 	isi68 | isi)
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	apollo68)
-		basic_machine=m68k-apollo
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
 		os=-sysv
 		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	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
 		;;
-	decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+	next)
+		basic_machine=m68k-next
+		os=-bsd
 		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
 		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
 		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
+	np1)
+		basic_machine=np1-gould
 		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	pbd)
+		basic_machine=sparc-tti
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	pbb)
+		basic_machine=m68k-tti
 		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
+        pc532)
+		basic_machine=ns32k-pc532
 		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
+	pn)
+		basic_machine=pn-gould
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
 		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+	spur)
+		basic_machine=spur-unknown
 		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
+	sun2)
+		basic_machine=m68000-sun
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
 		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
 		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
 		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
 		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		os=-hpux
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
 		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		os=-hpux
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
+	sun3)
+		basic_machine=m68k-sun
 		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	sun4)
+		basic_machine=sparc-sun
 		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
 		;;
-	pn)
-		basic_machine=pn-gould
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
-	np1)
-		basic_machine=np1-gould
+	tower | tower-32)
+		basic_machine=m68k-ncr
 		;;
 	ultra3)
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -457,6 +458,10 @@ case $basic_machine in
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-- 
2.43.5