X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c809458b5564ffc0249ede48342b474865c4da4a..64b25365bebe1d4f47994b2141ce8115301c34b5:/config.sub

diff --git a/config.sub b/config.sub
index 8a68fbbf1e..25300219eb 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.
 
 # First pass through any local machine types.
 case $1 in
@@ -54,104 +54,121 @@ 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.subr 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* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin)
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
 		os=
 		basic_machine=$1
 		;;
+	-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.
-		os=-sco3.2v4
-		basic_machine=i386-unknown
+		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=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		os=-isc
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		;;
+	-lynx)
+		os=-lynxos
 		;;
 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)
+		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
+		| powerpc)
 		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-*)
+	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+	      | 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
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	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
+	alliant | fx80)
+		basic_machine=fx80-alliant
 		;;
-	i386-isc* | isc)
-		basic_machine=i386-unknown
-		os=-isc
+	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
 		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
 		;;
 	convex-c1)
 		basic_machine=c1-convex
@@ -173,27 +190,110 @@ 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
 		;;
+	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
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
 	elxsi)
 		basic_machine=elxsi-elxsi
 		os=-bsd
 		;;
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
-		os=-bsd
+		;;
+	fx2800)
+		basic_machine=i860-alliant
 		;;
 	genix)
 		basic_machine=ns32k-ns
 		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	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
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# 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
@@ -204,30 +304,101 @@ case $basic_machine in
 			;;
 		esac
 		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
 		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
 		;;
-	3b*)
-		basic_machine=we32k-att
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
 		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
+	next)
+		basic_machine=m68k-next
+		case $os in
+		    -ns2*)
+			;;
+		    *)
+		      os=-ns3
+			;;
+		esac
 		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
 		;;
         pc532)
 		basic_machine=ns32k-pc532
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	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
+		;;
+	spur)
+		basic_machine=spur-unknown
 		;;
 	sun2)
 		basic_machine=m68000-sun
@@ -262,163 +433,28 @@ case $basic_machine in
 	sun4)
 		basic_machine=sparc-sun
 		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	next)
-		basic_machine=m68k-next
-		os=-bsd
-		;;
-	amiga)
-		basic_machine=m68k-cbm
-		;;
-	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
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	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
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		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
-		os=-sysv
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	h8300hds)
-		basic_machine=h8300-hitachi
-		os=-hds
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-m88kbcs
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	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
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	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
 		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -427,6 +463,13 @@ case $basic_machine in
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -452,6 +495,15 @@ case $basic_machine in
 	sparc)
 		basic_machine=sparc-sun
 		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -472,18 +524,34 @@ 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* \
-	      | -unos* | -osf* | -luna* | -dgux* | -solari* | -sym* \
+	# -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* )
+	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
+	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -ns*)
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
 	-osfrose*)
 		os=-osfrose
@@ -515,6 +583,12 @@ case $os in
 	-svr3)
 		os=-sysv3
 		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
 	-xenix)
 		os=-xenix
 		;;
@@ -532,7 +606,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
 		;;
@@ -557,7 +641,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)
@@ -572,15 +659,39 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
+	*-sequent)
+		os=-bsd
+		;;
 	*-crds)
 		os=-unos
 		;;
 	*-ns)
 		os=-genix
 		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-bsd
+		;;
 	i[34]86-*)
 		os=-sco3.2v2
 		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
 	*)
 		os=-none
 		;;
@@ -593,15 +704,24 @@ vendor=unknown
 case $basic_machine in
 	*-unknown)
 		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
 			-sunos*)
 				vendor=sun
 				;;
+			-lynxos*)
+				vendor=lynx
+				;;
 			-aix*)
 				vendor=ibm
 				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-hiux*)
+				vendor=hitachi
+				;;
 			-unos*)
 				vendor=crds
 				;;
@@ -614,6 +734,9 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
+			-mvs*)
+				vendor=ibm
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;