OSDN Git Service

Fix typo
[pf3gnuchains/gcc-fork.git] / config.sub
index c771bc2..4f442ec 100755 (executable)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998, 1999 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.
@@ -98,13 +98,13 @@ case $os in
                os=
                basic_machine=$1
                ;;
-       -sim | -cisco | -oki | -wec | -winbond )        # CYGNUS LOCAL
+       -sim | -cisco | -oki | -wec | -winbond )        # EGCS LOCAL
                os=
                basic_machine=$1
                ;;
-       -scout)                                         # CYGNUS LOCAL
+       -scout)                                         # EGCS LOCAL
                ;;
-       -wrs)                                           # CYGNUS LOCAL
+       -wrs)                                           # EGCS LOCAL
                os=vxworks
                basic_machine=$1
                ;;
@@ -112,7 +112,7 @@ case $os in
                os=-hiuxwe2
                ;;
        -sco5)
-               os=sco3.2v5
+               os=-sco3.2v5
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
        -sco4)
@@ -131,6 +131,9 @@ case $os in
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
+       -udk*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
        -isc)
                os=-isc2.2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -161,36 +164,41 @@ case $basic_machine in
        # Some are omitted here because they have special meanings below.
        tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
                | arme[lb] | pyramid | mn10200 | mn10300 \
-               | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-               | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-               | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+               | tron | a29k | 580 | i960 | h8300 \
+               | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+               | alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
+               | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+               | 1750a | dsp16xx | pdp11 \
                | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
                | mipstx39 | mipstx39el \
-               | sparc | sparclet | sparclite | sparc64 | v850)
+               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
                basic_machine=$basic_machine-unknown
                ;;
-       m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
+       m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
+               | h8500 | w65) # EGCS LOCAL
+               ;;
+       thumb)
                basic_machine=$basic_machine-unknown
                ;;
-       mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith/vr4300
+       mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
                basic_machine=$basic_machine-unknown
                ;;
-       mips64vr4100 | mips64vr4100el) # CYGNUS LOCAL jsmith/vr4100
+       mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
                basic_machine=$basic_machine-unknown
                ;;
-       mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
+       mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
                basic_machine=$basic_machine-unknown
                ;;
-       mips16) # CYGNUS LOCAL krk/mips16
+       mips16)
                basic_machine=$basic_machine-unknown
                ;;
-       d10v)                           # CYGNUS LOCAL meissner/d10v
+       d10v)
                basic_machine=$basic_machine-unknown
                ;;
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.
-       i[3456]86)
+       i[34567]86)
          basic_machine=$basic_machine-pc
          ;;
        # Object if more than one company name word.
@@ -199,30 +207,44 @@ case $basic_machine in
                exit 1
                ;;
        # Recognize the basic CPU types with company name.
-       vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+       vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
              | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-             | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-             | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-             | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+             | xmp-* | ymp-* \
+             | hppa-* | hppa1.0-* | hppa1.1-* \
+             | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+             | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
+             | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
+             | xps100-* | clipper-* | orion-* \
              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-             | sparc64-* | mips64-* | mipsel-* \
-             | mips64el-* | mips64orion-* | mips64orionel-* \
+             | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
+             | mips64el-* | mips64orion-* | mips64orionel-*  \
              | mipstx39-* | mipstx39el-* \
-             | f301-*)
+             | f301-* | arm*-*)
+               ;;
+       m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
+               ;;
+       thumb-*) # EGCS LOCAL angela/thumb
+               ;;
+       v850-*) # EGCS LOCAL
+               ;;
+       d30v-*) # EGCS LOCAL
+               ;;
+       mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
                ;;
-       m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # CYGNUS LOCAL
+       mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
                ;;
-       mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith/vr4300
+       mips16-*) # EGCS LOCAL krk/mips16
                ;;
-       mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
+       tic30-*) # EGCS LOCAL ian/tic30
                ;;
-       mips16-*) # CYGNUS LOCAL krk/mips16
+       c30-*) # EGCS LOCAL ian/tic30
+               basic_machine=tic30-unknown
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
-       386bsd)                                         # CYGNUS LOCAL
+       386bsd)                                         # EGCS LOCAL
                basic_machine=i386-unknown
                os=-bsd
                ;;
@@ -232,11 +254,11 @@ case $basic_machine in
        3b*)
                basic_machine=we32k-att
                ;;
-       a29khif)                                        # CYGNUS LOCAL
+       a29khif)                                        # EGCS LOCAL
                basic_machine=a29k-amd
                os=-udi
                ;;
-       adobe68k)                                       # CYGNUS LOCAL
+       adobe68k)                                       # EGCS LOCAL
                basic_machine=m68010-adobe
                os=-scout
                ;;
@@ -269,7 +291,7 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-sysv
                ;;
-       apollo68bsd)                                    # CYGNUS LOCAL
+       apollo68bsd)                                    # EGCS LOCAL
                basic_machine=m68k-apollo
                os=-bsd
                ;;
@@ -349,7 +371,7 @@ case $basic_machine in
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;
-       es1800 | OSE68k | ose68k | ose | OSE)           # CYGNUS LOCAL
+       es1800 | OSE68k | ose68k | ose | OSE)           # EGCS LOCAL
                basic_machine=m68k-ericsson
                os=-ose
                ;;
@@ -371,11 +393,11 @@ case $basic_machine in
                basic_machine=h8300-hitachi
                os=-hms
                ;;
-       h8300xray)                                      # CYGNUS LOCAL
+       h8300xray)                                      # EGCS LOCAL
                basic_machine=h8300-hitachi
                os=-xray
                ;;
-       h8500hms)                                       # CYGNUS LOCAL
+       h8500hms)                                       # EGCS LOCAL
                basic_machine=h8500-hitachi
                os=-hms
                ;;
@@ -394,29 +416,47 @@ case $basic_machine in
                basic_machine=m68k-hp
                os=-hpux
                ;;
-        w89k-*)                                                # CYGNUS LOCAL
+        w89k-*)                                                # EGCS LOCAL
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
-        op50n-*)                                       # CYGNUS LOCAL
+        op50n-*)                                       # EGCS LOCAL
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
-        op60c-*)                                       # CYGNUS LOCAL
+        op60c-*)                                       # EGCS LOCAL
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
-        hppro)                                         # CYGNUS LOCAL
+        hppro)                                         # EGCS LOCAL
                 basic_machine=hppa1.1-hp
                 os=-proelf
                 ;;
+       hp3k9[0-9][0-9] | hp9[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
        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)
+       hp9k6[0-9][0-9] | hp6[0-9][0-9] )
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k7[0-79][0-9] | hp7[0-79][0-9] )
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k78[0-9] | hp78[0-9] )
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
+       hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][13679] | hp8[0-9][13679] )
                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -425,7 +465,7 @@ case $basic_machine in
        hppa-next)
                os=-nextstep3
                ;;
-       hppaosf)                                        # CYGNUS LOCAL
+       hppaosf)                                        # EGCS LOCAL
                basic_machine=hppa1.1-hp
                os=-osf
                ;;
@@ -434,34 +474,38 @@ case $basic_machine in
                os=-mvs
                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-       i[3456]86v32)
+       i[34567]86v32)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv32
                ;;
-       i[3456]86v4*)
+       i[34567]86v4*)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv4
                ;;
-       i[3456]86v)
+       i[34567]86v)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv
                ;;
-       i[3456]86sol2)
+       i[34567]86sol2)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;
-       i386mach)                                       # CYGNUS LOCAL
+       i386mach)                                       # EGCS LOCAL
                basic_machine=i386-mach
                os=-mach
                ;;
-       i386-vsta | vsta)                               # CYGNUS LOCAL
+       i386-vsta | vsta)                               # EGCS LOCAL
                basic_machine=i386-unknown
                os=-vsta
                ;;
-       i386-go32 | go32)                               # CYGNUS LOCAL
+       i386-go32 | go32)                               # EGCS LOCAL
                basic_machine=i386-unknown
                os=-go32
                ;;
+       i386-mingw32 | mingw32)
+               basic_machine=i386-unknown
+               os=-mingw32
+               ;;
        iris | iris4d)
                basic_machine=mips-sgi
                case $os in
@@ -504,11 +548,11 @@ case $basic_machine in
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;
-       monitor)                                        # CYGNUS LOCAL
+       monitor)                                        # EGCS LOCAL
                basic_machine=m68k-rom68k
                os=-coff
                ;;
-       msdos)                                          # CYGNUS LOCAL
+       msdos)                                          # EGCS LOCAL
                basic_machine=i386-unknown      
                os=-msdos
                ;;
@@ -517,9 +561,13 @@ case $basic_machine in
                os=-sysv4
                ;;
        netbsd386)
-               basic_machine=i386-unknown              # CYGNUS LOCAL
+               basic_machine=i386-unknown              # EGCS LOCAL
                os=-netbsd
                ;;
+       netwinder)
+               basic_machine=armv4l-corel
+               os=-linux
+               ;;
        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos
@@ -532,7 +580,7 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
-       necv70)                                         # CYGNUS LOCAL
+       necv70)                                         # EGCS LOCAL
                basic_machine=v70-nec
                os=-sysv
                ;;
@@ -561,18 +609,18 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-nindy
                ;;
-       mon960)                                         # CYGNUS LOCAL
+       mon960)                                         # EGCS LOCAL
                basic_machine=i960-intel
                os=-mon960
                ;;
        np1)
                basic_machine=np1-gould
                ;;
-       OSE68000 | ose68000)                            # CYGNUS LOCAL
+       OSE68000 | ose68000)                            # EGCS LOCAL
                basic_machine=m68000-ericsson
                os=-ose
                ;;
-       os68k)                                          # CYGNUS LOCAL
+       os68k)                                          # EGCS LOCAL
                basic_machine=m68k-none
                os=-os68k
                ;;
@@ -593,25 +641,23 @@ case $basic_machine in
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pentium | p5)
-               basic_machine=i586-intel
+       pentium | p5 | k5 | nexen)
+               basic_machine=i586-pc
                ;;
-       pentiumpro | p6)
-               basic_machine=i686-intel
+       pentiumpro | p6 | k6 | 6x86)
+               basic_machine=i686-pc
                ;;
-       pentium-* | p5-*)
+       pentiumii | pentium2)
+               basic_machine=i786-pc
+               ;;
+       pentium-* | p5-* | k5-* | nexen-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       pentiumpro-* | p6-*)
+       pentiumpro-* | p6-* | k6-* | 6x86-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       k5)
-               # We don't have specific support for AMD's K5 yet, so just call it a Pentium
-               basic_machine=i586-amd
-               ;;
-       nexen)
-               # We don't have specific support for Nexgen yet, so just call it a Pentium
-               basic_machine=i586-nexgen
+       pentiumii-* | pentium2-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pn)
                basic_machine=pn-gould
@@ -631,7 +677,7 @@ case $basic_machine in
        ps2)
                basic_machine=i386-ibm
                ;;
-       rom68k)                                         # CYGNUS LOCAL
+       rom68k)                                         # EGCS LOCAL
                basic_machine=m68k-rom68k
                os=-coff
                ;;
@@ -641,7 +687,7 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
-       sa29200)                                        # CYGNUS LOCAL
+       sa29200)                                        # EGCS LOCAL
                basic_machine=a29k-amd
                os=-udi
                ;;
@@ -652,7 +698,7 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sparclite-wrs)                                  # CYGNUS LOCAL
+       sparclite-wrs)                                  # EGCS LOCAL
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
@@ -663,10 +709,10 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
-       st2000)                                         # CYGNUS LOCAL
+       st2000)                                         # EGCS LOCAL
                basic_machine=m68k-tandem
                ;;
-       stratus)                                        # CYGNUS LOCAL
+       stratus)                                        # EGCS LOCAL
                basic_machine=i860-stratus
                os=-sysv4
                ;;
@@ -731,7 +777,7 @@ case $basic_machine in
                basic_machine=a29k-nyu
                os=-sym1
                ;;
-       v810 | necv810)                                 # CYGNUS LOCAL
+       v810 | necv810)                                 # EGCS LOCAL
                basic_machine=v810-nec
                os=-none
                ;;
@@ -758,7 +804,7 @@ case $basic_machine in
                basic_machine=a29k-wrs
                os=-vxworks
                ;;
-       w65*)                                           # CYGNUS LOCAL
+       w65*)                                           # EGCS LOCAL
                basic_machine=w65-wdc
                os=-none
                ;;
@@ -769,7 +815,7 @@ case $basic_machine in
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
-       z8k-*-coff)                                     # CYGNUS LOCAL
+       z8k-*-coff)                                     # EGCS LOCAL
                basic_machine=z8k-unknown
                os=-sim
                ;;
@@ -780,13 +826,13 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-       w89k)                                           # CYGNUS LOCAL
+       w89k)                                           # EGCS LOCAL
                basic_machine=hppa1.1-winbond
                ;;
-       op50n)                                          # CYGNUS LOCAL
+       op50n)                                          # EGCS LOCAL
                basic_machine=hppa1.1-oki
                ;;
-       op60c)                                          # CYGNUS LOCAL
+       op60c)                                          # EGCS LOCAL
                basic_machine=hppa1.1-oki
                ;;
        mips)
@@ -811,7 +857,7 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sparc)
+       sparc | sparcv9)
                basic_machine=sparc-sun
                ;;
         cydra)
@@ -823,12 +869,16 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
-       mac | mpw | mac-mpw)                            # CYGNUS LOCAL
+       mac | mpw | mac-mpw)                            # EGCS LOCAL
                basic_machine=m68k-apple
                ;;
-       pmac | pmac-mpw)                                # CYGNUS LOCAL
+       pmac | pmac-mpw)                                # EGCS LOCAL
                basic_machine=powerpc-apple
                ;;
+       c4x*)
+               basic_machine=c4x-none
+               os=-coff
+               ;;
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
@@ -861,9 +911,12 @@ case $os in
        -solaris)
                os=-solaris2
                ;;
-       -unixware* | svr4*)
+       -svr4*)
                os=-sysv4
                ;;
+       -unixware*)
+               os=-sysv4.2uw
+               ;;
        -gnu/linux*)
                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                ;;
@@ -879,14 +932,15 @@ case $os in
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -uxpv*)
+             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* )
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
-       # CYGNUS LOCAL
+       # EGCS LOCAL
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
              | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
              | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
@@ -894,7 +948,7 @@ case $os in
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
-       # END CYGNUS LOCAL
+       # END EGCS LOCAL
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
@@ -919,7 +973,7 @@ case $os in
        -acis*)
                os=-aos
                ;;
-       -386bsd)                                        # CYGNUS LOCAL
+       -386bsd)                                        # EGCS LOCAL
                os=-bsd
                ;;
        -ctix* | -uts*)
@@ -953,10 +1007,10 @@ case $os in
        # This must come after -sysvr4.
        -sysv*)
                ;;
-       -ose*)                                          # CYGNUS LOCAL
+       -ose*)                                          # EGCS LOCAL
                os=-ose
                ;;
-       -es1800*)                                       # CYGNUS LOCAL
+       -es1800*)                                       # EGCS LOCAL
                os=-ose
                ;;
        -xenix)
@@ -987,6 +1041,9 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
+       arm*-corel)
+               os=-linux
+               ;;
        arm*-semi)
                os=-aout
                ;;
@@ -1008,13 +1065,13 @@ case $basic_machine in
                # default.
                # os=-sunos4
                ;;
-       m68*-cisco)                                     # CYGNUS LOCAL
+       m68*-cisco)                                     # EGCS LOCAL
                os=-aout
                ;;
-       mips*-cisco)                                    # CYGNUS LOCAL
+       mips*-cisco)                                    # EGCS LOCAL
                os=-elf
                ;;
-        mips*-*)                                        # CYGNUS LOCAL
+        mips*-*)                                        # EGCS LOCAL
                 os=-elf
                 ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
@@ -1023,19 +1080,19 @@ case $basic_machine in
        sparc-* | *-sun)
                os=-sunos4.1.1
                ;;
-       *-be)                                           # CYGNUS LOCAL
+       *-be)
                os=-beos
                ;;
        *-ibm)
                os=-aix
                ;;
-       *-wec)                                          # CYGNUS LOCAL
+       *-wec)                                          # EGCS LOCAL
                os=-proelf
                ;;
-       *-winbond)                                      # CYGNUS LOCAL
+       *-winbond)                                      # EGCS LOCAL
                os=-proelf
                ;;
-       *-oki)                                          # CYGNUS LOCAL
+       *-oki)                                          # EGCS LOCAL
                os=-proelf
                ;;
        *-hp)
@@ -1101,13 +1158,13 @@ case $basic_machine in
        f301-fujitsu)
                os=-uxpv
                ;;
-       *-rom68k)                                       # CYGNUS LOCAL
+       *-rom68k)                                       # EGCS LOCAL
                os=-coff
                ;;
-       *-*bug)                                         # CYGNUS LOCAL
+       *-*bug)                                         # EGCS LOCAL
                os=-coff
                ;;
-       *-apple)                                        # CYGNUS LOCAL
+       *-apple)                                        # EGCS LOCAL
                os=-macos
                ;;
        *)
@@ -1131,12 +1188,15 @@ case $basic_machine in
                        -aix*)
                                vendor=ibm
                                ;;
-                       -beos*)                                         # CYGNUS LOCAL
+                       -beos*)
                                vendor=be
                                ;;
                        -hpux*)
                                vendor=hp
                                ;;
+                       -mpeix*)
+                               vendor=hp
+                               ;;
                        -hiux*)
                                vendor=hitachi
                                ;;
@@ -1164,10 +1224,10 @@ case $basic_machine in
                        -aux*)
                                vendor=apple
                                ;;
-                       -hms*)                          # CYGNUS LOCAL
+                       -hms*)                          # EGCS LOCAL
                                vendor=hitachi
                                ;;
-                       -mpw* | -macos*)                # CYGNUS LOCAL
+                       -mpw* | -macos*)                # EGCS LOCAL
                                vendor=apple
                                ;;
                esac