Fri Nov 20 05:24:16 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)

	* config.sub: Added machines and operating systems for Emacs
	ports, since Emacs now uses config.sub for its configuration.
	New manufacturers recognized not to be operating systems: High
	Level Hardware (highlevel, defaults to using BSD), Gould
	(gould, defaults to System V), Commodore (cbm, defaults to
	amigados), National Semiconductor (ns, defaults to Genix), and
	Masscomp (masscomp, defaults to RTU).
	Recognize the NS1600 (ns16k) and the Clipper (clipper) as
	processors.
	Recognize these processors with default manufacturers: the
	Cydra (cydra) from Cydrome (cydrome), the XPS100 (xps100) from
	Honeywell (honeywell), and the Orion (orion) and Orion 1/05
	(orion105) from High Level Hardware (highlevel).
	If the ISC operating system is given with a version number,
	don't kill it and set it to 2.2; just have it default to 2.2
	if omitted.
	Make Irix SGI's default operating system, not SYSV.
	Make BSD Encore's default, so it applies for all Encore
	machines, not just the umax and mmax abbreviations.
	All of Encore's machines use BSD, not just the ns32k-based
	ones.  Make it the manufacturer's default.
	Make it possible to specify an operating system for a Gould
	machine.  Make sysv the manufacturer's default, so it applies
	when we specify the manufacturer as well as when we omit it.
	Add Uniplus (uniplus), Iris (iris), Xenix (xenix), and RTU
	(rtu) as recognized operating system names.

1 files changed, 57 insertions, 20 deletions

diff --git a/config.sub b/config.sub
index 8a68fbbf1e5..3d6dc83fcc9 100755
--- a/config.sub
+++ b/config.sub
@@ -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,15 +54,17 @@ 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
         -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* | \
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-        -harris | -dolphin)
+        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
                 os=
                 basic_machine=$1
                 ;;
@@ -75,8 +77,11 @@ case $os in
                 os=-sco3.2v2
                 basic_machine=i386-unknown
                 ;;
+        -isc)
+                os=-isc2.2
+                basic_machine=i386-unknown
+                ;;
         -isc*)
-                os=-isc
                 basic_machine=i386-unknown
                 ;;
 esac
@@ -87,7 +92,7 @@ case $basic_machine in
         # 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 )
                 basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the basic CPU types with with company name.
@@ -95,7 +100,8 @@ case $basic_machine in
               | 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-* )
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -189,7 +195,6 @@ case $basic_machine in
                 ;;
         encore | umax | mmax)
                 basic_machine=ns32k-encore
-                os=-bsd
                 ;;
         genix)
                 basic_machine=ns32k-ns
@@ -284,6 +289,14 @@ case $basic_machine in
         amiga)
                 basic_machine=m68k-cbm
                 ;;
+        amigados)
+                basic_machine=m68k-cbm
+                os=-amigados
+                ;;
+        amigaunix | amix)
+                basic_machine=m68k-cbm
+                os=-sysv4
+                ;;
         hp9k3[2-9][0-9])
                 basic_machine=m68k-hp
                 ;;
@@ -339,14 +352,6 @@ case $basic_machine in
                 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
@@ -409,11 +414,9 @@ case $basic_machine in
                 ;;
         pn)
                 basic_machine=pn-gould
-                os=-sysv
                 ;;
         np1)
                 basic_machine=np1-gould
-                os=-sysv
                 ;;
         ultra3)
                 basic_machine=a29k-nyu
@@ -427,6 +430,9 @@ case $basic_machine in
                 basic_machine=m68k-wrs
                 os=-vxworks
                 ;;
+        xps | xps100)
+                basic_machine=xps100-honeywell
+                ;;
         none)
                 basic_machine=none-none
                 os=-none
@@ -452,6 +458,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
@@ -483,7 +498,7 @@ case $os in
               | -unos* | -osf* | -luna* | -dgux* | -solari* | -sym* \
               | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
               | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs* \
-              | -riscos* | -linux* )
+              | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* )
                 ;;
         -osfrose*)
                 os=-osfrose
@@ -532,6 +547,13 @@ 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
         *-dec | vax-*)
                 os=-ultrix4.2
@@ -557,7 +579,7 @@ case $basic_machine in
         *-hp)
                 os=-hpux
                 ;;
-        *-sgi | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+        i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
                 os=-sysv
                 ;;
         *-cbm)
@@ -581,6 +603,21 @@ case $basic_machine in
         i[34]86-*)
                 os=-sco3.2v2
                 ;;
+        *-gould)
+                os=-sysv
+                ;;
+        *-highlevel)
+                os=-bsd
+                ;;
+        *-encore)
+                os=-bsd
+                ;;
+        *-sgi)
+                os=-irix
+                ;;
+        *-masscomp)
+                os=-rtu
+                ;;
         *)
                 os=-none
                 ;;