removed m88kbcs, changed delta88 and harris to

[kopensolaris-gnu/glibc.git] / config.sub

diff --git a/config.sub b/config.sub
index b8865dc..d79f104 100755 (executable)
--- 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
 # 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
 
 # First pass through any local machine types.
 case $1 in


@@ -54,30 +54,34 @@ if [ $basic_machine != $1 ]
 then os=`echo $1 | sed 's/.*-/-/'`
 else os=; fi
 
 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* | \
 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
                ;;
        -sco3.2v[4-9]*)
                # Don't forget version if it is 3.2v4 or newer.
                os=
                basic_machine=$1
                ;;
        -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
                ;;
        -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/'`

                ;;
        -isc*)
                ;;
        -isc*)

-               os=-isc
-               basic_machine=i386-unknown
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`

                ;;
 esac
 
                ;;
 esac
 


@@ -87,7 +91,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 \
        # 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.
                basic_machine=$basic_machine-unknown
                ;;
        # Recognize the basic CPU types with with company name.


@@ -95,7 +99,8 @@ case $basic_machine in
              | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
              | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
              | 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.
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.


@@ -107,45 +112,22 @@ case $basic_machine in
                basic_machine=vax-dec
                os=-vms
                ;;
                basic_machine=vax-dec
                os=-vms
                ;;

-       i386v32)
-               basic_machine=i386-unknown
+# 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
                ;;
                os=-sysv32
                ;;

-       i386-sco* | i386sco | sco)
-               basic_machine=i386-unknown
-               os=-sco3.2v2
-               ;;
-       i386-isc* | isc)
-               basic_machine=i386-unknown
-               os=-isc
-               ;;
-       i486v32)
-               basic_machine=i486-unknown
-               os=-sysv32
-               ;;
-       i486-sco* | i486sco | sco)
-               basic_machine=i486-unknown
-               os=-sco3.2v2
-               ;;
-       i486-isc* | isc)
-               basic_machine=i486-unknown
-               os=-isc
-               ;;
-       i386v4*)
-               basic_machine=i386-unknown
-               os=-sysv4
-               ;;
-       i486v4*)
-               basic_machine=i486-unknown
+       i[34]86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`

                os=-sysv4
                ;;
                os=-sysv4
                ;;

-       i386v)
-               basic_machine=i386-unknown
+       i[34]86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`

                os=-sysv
                ;;
                os=-sysv
                ;;

-       i486v)
-               basic_machine=i486-unknown
-               os=-sysv
+       i[34]86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+               os=-solaris2

                ;;
        spur)
                basic_machine=spur-unknown
                ;;
        spur)
                basic_machine=spur-unknown


@@ -189,7 +171,6 @@ case $basic_machine in
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore

-               os=-bsd

                ;;
        genix)
                basic_machine=ns32k-ns
                ;;
        genix)
                basic_machine=ns32k-ns


@@ -284,6 +265,14 @@ case $basic_machine in
        amiga)
                basic_machine=m68k-cbm
                ;;
        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
                ;;
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
                ;;


@@ -339,14 +328,6 @@ case $basic_machine in
                basic_machine=580-amdahl
                os=-sysv
                ;;
                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
        cray | ymp)
                basic_machine=ymp-cray
                os=-unicos


@@ -361,7 +342,7 @@ case $basic_machine in
                ;;
        delta88)
                basic_machine=m88k-motorola
                ;;
        delta88)
                basic_machine=m88k-motorola

-               os=-m88kbcs
+               os=-sysv3

                ;;
        dpx2)
                basic_machine=m68k-bull
                ;;
        dpx2)
                basic_machine=m68k-bull


@@ -377,7 +358,7 @@ case $basic_machine in
                ;;
        harris)
                basic_machine=m88k-harris
                ;;
        harris)
                basic_machine=m88k-harris

-               os=-m88kbcs
+               os=-sysv3

                ;;
        hp300bsd)
                basic_machine=m68k-hp
                ;;
        hp300bsd)
                basic_machine=m68k-hp


@@ -409,11 +390,9 @@ case $basic_machine in
                ;;
        pn)
                basic_machine=pn-gould
                ;;
        pn)
                basic_machine=pn-gould

-               os=-sysv

                ;;
        np1)
                basic_machine=np1-gould
                ;;
        np1)
                basic_machine=np1-gould

-               os=-sysv

                ;;
        ultra3)
                basic_machine=a29k-nyu
                ;;
        ultra3)
                basic_machine=a29k-nyu


@@ -427,6 +406,9 @@ case $basic_machine in
                basic_machine=m68k-wrs
                os=-vxworks
                ;;
                basic_machine=m68k-wrs
                os=-vxworks
                ;;

+        xps | xps100)
+               basic_machine=xps100-honeywell
+               ;;

        none)
                basic_machine=none-none
                os=-none
        none)
                basic_machine=none-none
                os=-none


@@ -452,6 +434,15 @@ case $basic_machine in
        sparc)
                basic_machine=sparc-sun
                ;;
        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
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1


@@ -475,15 +466,25 @@ esac
 if [ "$os" ]
 then
 case $os in
 if [ "$os" ]
 then
 case $os in

+       # -solaris* is a basic system type, with this one exception.
+       -solaris1 | -solaris1.*)
+               os=`echo $os | sed -e 's|solaris1|sunos4|'`
+               ;;

        # 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* \
        # 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* \
+             | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \
+             | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \

              | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
              | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \

-             | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs* \
-             | -riscos* | -linux* )
+             | -nindy* | -vxworks* | -ebmon* | -hds*  \
+             | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* )
+               ;;
+       -sunos5*)
+               os=`echo $os | sed -e 's|sunos5|solaris2|'`
+               ;;
+       -sunos6*)
+               os=`echo $os | sed -e 's|sunos6|solaris3|'`

                ;;
        -osfrose*)
                os=-osfrose
                ;;
        -osfrose*)
                os=-osfrose


@@ -515,6 +516,9 @@ case $os in
        -svr3)
                os=-sysv3
                ;;
        -svr3)
                os=-sysv3
                ;;

+       -xenix)
+               os=-xenix
+               ;;

        -none)
                ;;
        *)
        -none)
                ;;
        *)


@@ -529,6 +533,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.
 # 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
 case $basic_machine in
        *-dec | vax-*)
                os=-ultrix4.2


@@ -554,7 +565,7 @@ case $basic_machine in
        *-hp)
                os=-hpux
                ;;
        *-hp)
                os=-hpux
                ;;

-       *-sgi | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)

                os=-sysv
                ;;
        *-cbm)
                os=-sysv
                ;;
        *-cbm)


@@ -569,6 +580,9 @@ case $basic_machine in
        m88k-omron*)
                os=-luna
                ;;
        m88k-omron*)
                os=-luna
                ;;

+       *-sequent)
+               os=-bsd
+               ;;

        *-crds)
                os=-unos
                ;;
        *-crds)
                os=-unos
                ;;


@@ -578,6 +592,21 @@ case $basic_machine in
        i[34]86-*)
                os=-sco3.2v2
                ;;
        i[34]86-*)
                os=-sco3.2v2
                ;;

+        *-gould)
+               os=-sysv
+               ;;
+        *-highlevel)
+               os=-bsd
+               ;;
+       *-encore)
+               os=-bsd
+               ;;
+        *-sgi)
+               os=-irix
+               ;;
+       *-masscomp)
+               os=-rtu
+               ;;

        *)
                os=-none
                ;;
        *)
                os=-none
                ;;