Fix up whitespace. Get rid of spurious casts to void.
[bpt/emacs.git] / config.sub
index 58e76bc..5f0e9f3 100755 (executable)
@@ -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 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. 
@@ -65,12 +65,23 @@ 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* | -hitachi | \
+       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -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.
                basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
@@ -89,15 +100,19 @@ case $os in
        -isc*)
                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 | ns16k | clipper | sparclite | i370 | sh)
+               | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
+               | powerpc)
                basic_machine=$basic_machine-unknown
                ;;
        # Object if more than one company name word.
@@ -105,14 +120,14 @@ case $basic_machine in
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
                ;;
-       # Recognize the basic CPU types with with company name.
+       # 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-* | cydra-* | ns16k-* \
              | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-             | sh-*)
+             | sh-* | powerpc-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
@@ -148,6 +163,10 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
+       paragon)
+               basic_machine=i860-intel
+               os=-osf
+               ;;
        alliant | fx80)
                basic_machine=fx80-alliant
                ;;
@@ -301,6 +320,14 @@ 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
+               ;;
+       pa-hitachi)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
        isi68 | isi)
                basic_machine=m68k-isi
                os=-sysv
@@ -360,9 +387,13 @@ case $basic_machine in
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
-       dpx2)
+       dpx2* | dpx2*-bull)
                basic_machine=m68k-bull
-               os=-sysv
+               os=-sysv3
+               ;;
+       sps7)
+               basic_machine=m68k-bull
+               os=-sysv2
                ;;
        ebmon29k)
                basic_machine=a29k-amd
@@ -483,22 +514,27 @@ 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* \
+       # -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* | -hms* | -mvs* | -clix* \
-             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* )
+             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
+             | -hiux* | -386bsd* | -netbsd* | -riscix* | -lynxos*)
                ;;
        -sunos5*)
                os=`echo $os | sed -e 's|sunos5|solaris2|'`
@@ -536,6 +572,12 @@ case $os in
        -svr3)
                os=-sysv3
                ;;
+       -sysvr4)
+               os=-sysv4
+               ;;
+       # This must come after -sysvr4.
+       -sysv*)
+               ;;
        -xenix)
                os=-xenix
                ;;
@@ -561,6 +603,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+       *-acorn)
+               os=-riscix1.2
+               ;;
        *-dec | vax-*)
                os=-ultrix4.2
                ;;
@@ -585,6 +630,9 @@ case $basic_machine in
        *-hp)
                os=-hpux
                ;;
+       *-hitachi)
+               os=-hiux
+               ;;
        i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
                os=-sysv
                ;;
@@ -645,15 +693,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
                                ;;