Changeset 7187 in orxonox.OLD for branches/shared_lib/config.sub

Timestamp:

Feb 22, 2006, 2:49:47 AM (18 years ago)

Author:

bensch

Message:

ltdl

File:

• branches/shared_lib/config.sub (modified) (47 diffs)

branches/shared_lib/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-02-10'
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-06-08'
 
 # This file is (in principle) common to ALL GNU software.
@@ -30 +30 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -71 +70 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
@@ -119 +118 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -146 +144 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis)
                 os=
                 basic_machine=$1
@@ -226 +224 @@
         # Recognize the basic CPU types without company name.
         # Some are omitted here because they have special meanings below.
-        1750a | 580 \
-        | a29k \
-        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-        | c4x | clipper \
-        | d10v | d30v | dlx | dsp16xx \
-        | fr30 | frv \
-        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-        | i370 | i860 | i960 | ia64 \
-        | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-        | mips | mipsbe | mipseb | mipsel | mipsle \
-        | mips16 \
-        | mips64 | mips64el \
-        | mips64vr | mips64vrel \
-        | mips64orion | mips64orionel \
-        | mips64vr4100 | mips64vr4100el \
-        | mips64vr4300 | mips64vr4300el \
-        | mips64vr5000 | mips64vr5000el \
-        | mipsisa32 | mipsisa32el \
-        | mipsisa32r2 | mipsisa32r2el \
-        | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
-        | mipsisa64sb1 | mipsisa64sb1el \
-        | mipsisa64sr71k | mipsisa64sr71kel \
-        | mipstx39 | mipstx39el \
-        | mn10200 | mn10300 \
-        | msp430 \
-        | ns16k | ns32k \
-        | openrisc | or32 \
-        | pdp10 | pdp11 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-        | pyramid \
-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-        | sh64 | sh64le \
-        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
-        | v850 | v850e \
-        | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-        | z8k)
+        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+                | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+                | pyramid | mn10200 | mn10300 | tron | a29k \
+                | 580 | i960 | h8300 \
+                | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+                | hppa64 \
+                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+                | alphaev6[78] \
+                | we32k | ns16k | clipper | i370 | sh | sh[34] \
+                | powerpc | powerpcle \
+                | 1750a | dsp16xx | pdp10 | pdp11 \
+                | mips16 | mips64 | mipsel | mips64el \
+                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+                | v850 | c4x \
+                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+                | pj | pjl | h8500 | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -292 +266 @@
                 ;;
         # Recognize the basic CPU types with company name.
-        580-* \
-        | a29k-* \
-        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
-        | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | craynv-* | cydra-* \
-        | d10v-* | d30v-* | dlx-* \
-        | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-        | h8300-* | h8500-* \
-        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-        | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | m32r-* | m32rle-* \
-        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* \
-        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-        | mips16-* \
-        | mips64-* | mips64el-* \
-        | mips64vr-* | mips64vrel-* \
-        | mips64orion-* | mips64orionel-* \
-        | mips64vr4100-* | mips64vr4100el-* \
-        | mips64vr4300-* | mips64vr4300el-* \
-        | mips64vr5000-* | mips64vr5000el-* \
-        | mipsisa32-* | mipsisa32el-* \
-        | mipsisa32r2-* | mipsisa32r2el-* \
-        | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
-        | mipsisa64sb1-* | mipsisa64sb1el-* \
-        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-        | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | msp430-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
-        | orion-* \
-        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-        | pyramid-* \
-        | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-        | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tron-* \
-        | v850-* | v850e-* | vax-* \
-        | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa-* \
-        | ymp-* \
-        | z8k-*)
+        # FIXME: clean up the formatting here.
+        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+              | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+              | xmp-* | ymp-* \
+              | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+              | hppa2.0n-* | hppa64-* \
+              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+              | alphaev6[78]-* \
+              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+              | clipper-* | orion-* \
+              | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
+              | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+              | mips16-* | mips64-* | mipsel-* \
+              | mips64el-* | mips64orion-* | mips64orionel-* \
+              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+              | mipstx39-* | mipstx39el-* | mcore-* \
+              | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+              | [cjt]90-* \
+              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
                 ;;
         # Recognize the various machine names and aliases which stand
@@ -365 +308 @@
                 os=-udi
                 ;;
-        abacus)
-                basic_machine=abacus-unknown
-                ;;
         adobe68k)
                 basic_machine=m68010-adobe
@@ -382 +322 @@
                 os=-bsd
                 ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
-        amd64-*)
-                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -419 +353 @@
                 os=-dynix
                 ;;
-        c90)
-                basic_machine=c90-cray
-                os=-unicos
-                ;;
         convex-c1)
                 basic_machine=c1-convex
@@ -443 +373 @@
                 os=-bsd
                 ;;
-        cray | j90)
-                basic_machine=j90-cray
+        cray | ymp)
+                basic_machine=ymp-cray
                 os=-unicos
                 ;;
-        craynv)
-                basic_machine=craynv-cray
-                os=-unicosmp
-                ;;
-        cr16c)
-                basic_machine=cr16c-unknown
-                os=-elf
+        cray2)
+                basic_machine=cray2-cray
+                os=-unicos
+                ;;
+        [cjt]90)
+                basic_machine=${basic_machine}-cray
+                os=-unicos
                 ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
                 ;;
-        crx)
-                basic_machine=crx-unknown
-                os=-elf
+        cygwin*)
+                basic_machine=i586-pc
+                os=-cygwin
                 ;;
         da30 | da30-*)
@@ -473 +400 @@
         decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                 basic_machine=mips-dec
-                ;;
-        decsystem10* | dec10*)
-                basic_machine=pdp10-dec
-                os=-tops10
-                ;;
-        decsystem20* | dec20*)
-                basic_machine=pdp10-dec
-                os=-tops20
                 ;;
         delta | 3300 | motorola-3300 | motorola-delta \
@@ -489 +408 @@
                 basic_machine=m88k-motorola
                 os=-sysv3
-                ;;
-        djgpp)
-                basic_machine=i586-pc
-                os=-msdosdjgpp
                 ;;
         dpx20 | dpx20-*)
@@ -655 +570 @@
                 os=-sysv
                 ;;
-        mingw32)
-                basic_machine=i386-pc
-                os=-mingw32
+        mingw*)
+                basic_machine=i586-pc
+                os=-mingw
                 ;;
         miniframe)
@@ -666 +581 @@
                 os=-mint
                 ;;
+        mipsel*-linux*)
+                basic_machine=mipsel-unknown
+                os=-linux-gnu
+                ;;
+        mips*-linux*)
+                basic_machine=mips-unknown
+                os=-linux-gnu
+                ;;
         mips3*-*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -671 +594 @@
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
                 ;;
         monitor)
@@ -676 +603 @@
                 os=-coff
                 ;;
-        morphos)
-                basic_machine=powerpc-unknown
-                os=-morphos
-                ;;
         msdos)
                 basic_machine=i386-pc
                 os=-msdos
+                ;;
+        msys)
+                basic_machine=i386-pc
+                os=-msys
                 ;;
         mvs)
@@ -759 +686 @@
                 os=-proelf
                 ;;
-        or32 | or32-*)
-                basic_machine=or32-unknown
-                os=-coff
-                ;;
-        os400)
-                basic_machine=powerpc-ibm
-                os=-os400
-                ;;
         OSE68000 | ose68000)
                 basic_machine=m68000-ericsson
@@ -775 +694 @@
                 os=-os68k
                 ;;
+        p4w)
+                basic_machine=i586-pc
+                os=-p4w
+                ;;
         pa-hitachi)
                 basic_machine=hppa1.1-hitachi
@@ -789 +712 @@
                 basic_machine=m68k-tti
                 ;;
-        pc532 | pc532-*)
+        pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5 | k5 | k6 | nexgen | viac3)
+        pentium | p5 | k5 | k6 | nexgen)
                 basic_machine=i586-pc
                 ;;
-        pentiumpro | p6 | 6x86 | athlon | athlon_*)
+        pentiumpro | p6 | 6x86 | athlon)
                 basic_machine=i686-pc
                 ;;
-        pentiumii | pentium2 | pentiumiii | pentium3)
+        pentiumii | pentium2)
                 basic_machine=i686-pc
                 ;;
-        pentium4)
-                basic_machine=i786-pc
-                ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
@@ -810 +730 @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+        pentiumii-* | pentium2-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentium4-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -822 +739 @@
                 ;;
         ppc)    basic_machine=powerpc-unknown
-                ;;
+                ;;
         ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-                ;;
+                ;;
         ppcle-* | powerpclittle-*)
                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64)  basic_machine=powerpc64-unknown
-                ;;
-        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-                basic_machine=powerpc64le-unknown
-                ;;
-        ppc64le-* | powerpc64little-*)
-                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ps2)
@@ -858 +765 @@
                 basic_machine=romp-ibm
                 ;;
-        s390 | s390-*)
-                basic_machine=s390-ibm
-                ;;
-        s390x | s390x-*)
-                basic_machine=s390x-ibm
-                ;;
         sa29200)
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
-        sb1)
-                basic_machine=mipsisa64sb1-unknown
-                ;;
-        sb1el)
-                basic_machine=mipsisa64sb1el-unknown
-                ;;
-        sei)
-                basic_machine=mips-sei
-                os=-seiux
-                ;;
         sequent)
                 basic_machine=i386-sequent
@@ -885 +776 @@
                 os=-hms
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparclite-wrs | simso-wrs)
+        sparclite-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
@@ -955 +843 @@
                 ;;
         t3e)
-                basic_machine=alphaev5-cray
-                os=-unicos
-                ;;
-        t90)
-                basic_machine=t90-cray
+                basic_machine=t3e-cray
                 os=-unicos
                 ;;
@@ -966 +850 @@
                 os=-coff
                 ;;
-        tic55x | c55x*)
-                basic_machine=tic55x-unknown
-                os=-coff
-                ;;
-        tic6x | c6x*)
-                basic_machine=tic6x-unknown
-                os=-coff
-                ;;
         tx39)
                 basic_machine=mipstx39-unknown
@@ -980 +856 @@
                 basic_machine=mipstx39el-unknown
                 ;;
-        toad1)
-                basic_machine=pdp10-xkl
-                os=-tops20
-                ;;
         tower | tower-32)
                 basic_machine=m68k-ncr
-                ;;
-        tpf)
-                basic_machine=s390x-ibm
-                os=-tpf
                 ;;
         udi29k)
@@ -1012 +880 @@
                 ;;
         vpp*|vx|vx-*)
-                basic_machine=f301-fujitsu
-                ;;
+               basic_machine=f301-fujitsu
+               ;;
         vxworks960)
                 basic_machine=i960-wrs
@@ -1034 +902 @@
                 os=-proelf
                 ;;
-        xbox)
-                basic_machine=i686-pc
-                os=-mingw32
-                ;;
-        xps | xps100)
+        windows32)
+                basic_machine=i386-pc
+                os=-windows32-msvcrt
+                ;;
+        xmp)
+                basic_machine=xmp-cray
+                os=-unicos
+                ;;
+        xps | xps100)
                 basic_machine=xps100-honeywell
-                ;;
-        ymp)
-                basic_machine=ymp-cray
-                os=-unicos
                 ;;
         z8k-*-coff)
@@ -1065 +933 @@
                 basic_machine=hppa1.1-oki
                 ;;
+        mips)
+                if [ x$os = x-linux-gnu ]; then
+                        basic_machine=mips-unknown
+                else
+                        basic_machine=mips-mips
+                fi
+                ;;
         romp)
                 basic_machine=romp-ibm
-                ;;
-        mmix)
-                basic_machine=mmix-knuth
                 ;;
         rs6000)
@@ -1087 +959 @@
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh3 | sh4)
                 basic_machine=sh-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
-        cydra)
+        cydra)
                 basic_machine=cydra-cydrome
                 ;;
@@ -1110 +979 @@
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
+                ;;
+        c4x*)
+                basic_machine=c4x-none
+                os=-coff
                 ;;
         *-unknown)
@@ -1166 +1039 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* \
-              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -cygwin* | -msys* | -p4w* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1191 +1060 @@
                 esac
                 ;;
-        -nto-qnx*)
-                ;;
         -nto*)
-                os=`echo $os | sed -e 's|nto|nto-qnx|'`
+                os=-nto-qnx
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -1203 +1070 @@
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        -linux-dietlibc)
-                os=-linux-dietlibc
-                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
@@ -1218 +1082 @@
                 os=-openedition
                 ;;
-        -os400*)
-                os=-os400
-                ;;
         -wince*)
                 os=-wince
@@ -1239 +1100 @@
                 os=-aos
                 ;;
-        -atheos*)
-                os=-atheos
-                ;;
-        -syllable*)
-                os=-syllable
-                ;;
         -386bsd)
                 os=-bsd
@@ -1251 +1106 @@
                 os=-sysv
                 ;;
-        -nova*)
-                os=-rtmk-nova
-                ;;
         -ns2 )
-                os=-nextstep2
+                os=-nextstep2
                 ;;
         -nsk*)
@@ -1267 +1119 @@
                 os=-sysv4
                 ;;
-        -tpf*)
-                os=-tpf
-                ;;
         -triton*)
                 os=-sysv3
@@ -1297 +1146 @@
                 os=-xenix
                 ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                os=-mint
-                ;;
-        -aros*)
-                os=-aros
-                ;;
-        -kaos*)
-                os=-kaos
-                ;;
-        -zvmoe)
-                os=-zvmoe
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
                 ;;
         -none)
@@ -1340 +1180 @@
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-        # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
                 ;;
-        pdp11-*)
+        pdp11-*)
                 os=-none
                 ;;
@@ -1374 +1210 @@
                 os=-elf
                 ;;
-        or32-*)
-                os=-coff
-                ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
@@ -1389 +1222 @@
                 os=-aix
                 ;;
-        *-knuth)
-                os=-mmixware
-                ;;
         *-wec)
                 os=-proelf
@@ -1443 +1273 @@
                 os=-nextstep3
                 ;;
-        *-gould)
+        *-gould)
                 os=-sysv
                 ;;
-        *-highlevel)
+        *-highlevel)
                 os=-bsd
                 ;;
@@ -1452 +1282 @@
                 os=-bsd
                 ;;
-        *-sgi)
+        *-sgi)
                 os=-irix
                 ;;
-        *-siemens)
+        *-siemens)
                 os=-sysv4
                 ;;
@@ -1524 +1354 @@
                                 vendor=ibm
                                 ;;
-                        -os400*)
-                                vendor=ibm
-                                ;;
                         -ptx*)
                                 vendor=sequent
                                 ;;
-                        -tpf*)
-                                vendor=ibm
-                                ;;
-                        -vxsim* | -vxworks* | -windiss*)
+                        -vxsim* | -vxworks*)
                                 vendor=wrs
                                 ;;
@@ -1547 +1371 @@
                         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                 vendor=atari
-                                ;;
-                        -vos*)
-                                vendor=stratus
                                 ;;
                 esac