Changeset 26796 for main/trunk/greenstone3/src/packages/javagdbm/config.sub

Timestamp:

2013-01-29T16:21:04+13:00 (11 years ago)

Author:

davidb

Message:

Newer version of config.guess and config.sub to include architecture support for Android

File:

• main/trunk/greenstone3/src/packages/javagdbm/config.sub (modified) (63 diffs)

main/trunk/greenstone3/src/packages/javagdbm/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-06-08'
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-11-11'
 
 # This file is (in principle) common to ALL GNU software.
@@ -22 +23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -30 +31 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <[email protected]>.
+
+# Please send patches to <[email protected]>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -36 +39 @@
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 # This file is supposed to be the same for all GNU packages
@@ -70 +76 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83 +90 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -99 +106 @@
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
@@ -118 +125 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -144 +155 @@
     -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
     -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-    -apple | -axis)
+    -apple | -axis | -knuth | -cray | -microblaze)
         os=
         basic_machine=$1
+        ;;
+    -bluegene*)
+        os=-cnk
         ;;
     -sim | -cisco | -oki | -wec | -winbond)
@@ -162 +176 @@
         basic_machine=$1
         ;;
-    -chorusrdb)
-        os=-chorusrdb
+    -chorusrdb)
+        os=-chorusrdb
         basic_machine=$1
-        ;;
+        ;;
     -hiux*)
         os=-hiuxwe2
+        ;;
+    -sco6)
+        os=-sco5v6
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
     -sco5)
@@ -182 +200 @@
         ;;
     -sco3.2v[4-9]*)
+        # Don't forget version if it is 3.2v4 or newer.
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco5v6*)
         # Don't forget version if it is 3.2v4 or newer.
         basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -224 +246 @@
     # Recognize the basic CPU types without company name.
     # Some are omitted here because they have special meanings below.
-    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 | mips64vr5000el | mcore | s390 | s390x \
-        | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
-        | v850 | c4x \
-        | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-        | pj | pjl | h8500 | z8k)
+    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 | avr32 \
+        | be32 | be64 \
+    | bfin \
+    | c4x | clipper \
+    | d10v | d30v | dlx | dsp16xx \
+    | epiphany \
+    | fido | fr30 | frv \
+    | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+    | hexagon \
+    | i370 | i860 | i960 | ia64 \
+    | ip2k | iq2000 \
+    | le32 | le64 \
+    | lm32 \
+    | m32c | m32r | m32rle | m68000 | m68k | m88k \
+    | maxq | mb | microblaze | mcore | mep | metag \
+    | mips | mipsbe | mipseb | mipsel | mipsle \
+    | mips16 \
+    | mips64 | mips64el \
+    | mips64octeon | mips64octeonel \
+    | mips64orion | mips64orionel \
+    | mips64r5900 | mips64r5900el \
+    | mips64vr | mips64vrel \
+    | mips64vr4100 | mips64vr4100el \
+    | mips64vr4300 | mips64vr4300el \
+    | mips64vr5000 | mips64vr5000el \
+    | mips64vr5900 | mips64vr5900el \
+    | mipsisa32 | mipsisa32el \
+    | mipsisa32r2 | mipsisa32r2el \
+    | mipsisa64 | mipsisa64el \
+    | mipsisa64r2 | mipsisa64r2el \
+    | mipsisa64sb1 | mipsisa64sb1el \
+    | mipsisa64sr71k | mipsisa64sr71kel \
+    | mipstx39 | mipstx39el \
+    | mn10200 | mn10300 \
+    | moxie \
+    | mt \
+    | msp430 \
+    | nds32 | nds32le | nds32be \
+    | nios | nios2 \
+    | ns16k | ns32k \
+    | open8 \
+    | or32 \
+    | pdp10 | pdp11 | pj | pjl \
+    | powerpc | powerpc64 | powerpc64le | powerpcle \
+    | pyramid \
+    | rl78 | rx \
+    | score \
+    | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+    | sh64 | sh64le \
+    | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+    | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+    | spu \
+    | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+    | ubicom32 \
+    | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+    | we32k \
+    | x86 | xc16x | xstormy16 | xtensa \
+    | z8k | z80)
         basic_machine=$basic_machine-unknown
         ;;
-    m6811 | m68hc11 | m6812 | m68hc12)
+    c54x)
+        basic_machine=tic54x-unknown
+        ;;
+    c55x)
+        basic_machine=tic55x-unknown
+        ;;
+    c6x)
+        basic_machine=tic6x-unknown
+        ;;
+    m6811 | m68hc11 | m6812 | m68hc12 | picochip)
         # Motorola 68HC11/12.
         basic_machine=$basic_machine-unknown
@@ -252 +326 @@
         ;;
     m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+        ;;
+    ms1)
+        basic_machine=mt-unknown
+        ;;
+
+    strongarm | thumb | xscale)
+        basic_machine=arm-unknown
+        ;;
+
+    xscaleeb)
+        basic_machine=armeb-unknown
+        ;;
+
+    xscaleel)
+        basic_machine=armel-unknown
         ;;
 
@@ -266 +355 @@
         ;;
     # Recognize the basic CPU types with company name.
-    # 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-*)
+    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-* | avr32-* \
+    | be32-* | be64-* \
+    | bfin-* | bs2000-* \
+    | c[123]* | c30-* | [cjt]90-* | c4x-* \
+    | clipper-* | craynv-* | cydra-* \
+    | d10v-* | d30v-* | dlx-* \
+    | elxsi-* \
+    | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+    | h8300-* | h8500-* \
+    | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+    | hexagon-* \
+    | i*86-* | i860-* | i960-* | ia64-* \
+    | ip2k-* | iq2000-* \
+    | le32-* | le64-* \
+    | lm32-* \
+    | m32c-* | m32r-* | m32rle-* \
+    | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+    | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+    | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+    | mips16-* \
+    | mips64-* | mips64el-* \
+    | mips64octeon-* | mips64octeonel-* \
+    | mips64orion-* | mips64orionel-* \
+    | mips64r5900-* | mips64r5900el-* \
+    | mips64vr-* | mips64vrel-* \
+    | mips64vr4100-* | mips64vr4100el-* \
+    | mips64vr4300-* | mips64vr4300el-* \
+    | mips64vr5000-* | mips64vr5000el-* \
+    | mips64vr5900-* | mips64vr5900el-* \
+    | mipsisa32-* | mipsisa32el-* \
+    | mipsisa32r2-* | mipsisa32r2el-* \
+    | mipsisa64-* | mipsisa64el-* \
+    | mipsisa64r2-* | mipsisa64r2el-* \
+    | mipsisa64sb1-* | mipsisa64sb1el-* \
+    | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+    | mipstx39-* | mipstx39el-* \
+    | mmix-* \
+    | mt-* \
+    | msp430-* \
+    | nds32-* | nds32le-* | nds32be-* \
+    | nios-* | nios2-* \
+    | none-* | np1-* | ns16k-* | ns32k-* \
+    | open8-* \
+    | orion-* \
+    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+    | pyramid-* \
+    | rl78-* | romp-* | rs6000-* | rx-* \
+    | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+    | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+    | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+    | sparclite-* \
+    | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+    | tahoe-* \
+    | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+    | tile*-* \
+    | tron-* \
+    | ubicom32-* \
+    | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+    | vax-* \
+    | we32k-* \
+    | x86-* | x86_64-* | xc16x-* | xps100-* \
+    | xstormy16-* | xtensa*-* \
+    | ymp-* \
+    | z8k-* | z80-*)
+        ;;
+    # Recognize the basic CPU types without company name, with glob match.
+    xtensa*)
+        basic_machine=$basic_machine-unknown
         ;;
     # Recognize the various machine names and aliases which stand
@@ -308 +447 @@
         os=-udi
         ;;
+    abacus)
+        basic_machine=abacus-unknown
+        ;;
     adobe68k)
         basic_machine=m68010-adobe
@@ -322 +464 @@
         os=-bsd
         ;;
+    amd64)
+        basic_machine=x86_64-pc
+        ;;
+    amd64-*)
+        basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
     amdahl)
         basic_machine=580-amdahl
@@ -345 +493 @@
         os=-bsd
         ;;
+    aros)
+        basic_machine=i386-pc
+        os=-aros
+        ;;
     aux)
         basic_machine=m68k-apple
@@ -353 +505 @@
         os=-dynix
         ;;
+    blackfin)
+        basic_machine=bfin-unknown
+        os=-linux
+        ;;
+    blackfin-*)
+        basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
+    bluegene*)
+        basic_machine=powerpc-ibm
+        os=-cnk
+        ;;
+    c54x-*)
+        basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c55x-*)
+        basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c6x-*)
+        basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c90)
+        basic_machine=c90-cray
+        os=-unicos
+        ;;
+    cegcc)
+        basic_machine=arm-unknown
+        os=-cegcc
+        ;;
     convex-c1)
         basic_machine=c1-convex
@@ -373 +554 @@
         os=-bsd
         ;;
-    cray | ymp)
-        basic_machine=ymp-cray
+    cray | j90)
+        basic_machine=j90-cray
         os=-unicos
         ;;
-    cray2)
-        basic_machine=cray2-cray
-        os=-unicos
-        ;;
-    [cjt]90)
-        basic_machine=${basic_machine}-cray
-        os=-unicos
+    craynv)
+        basic_machine=craynv-cray
+        os=-unicosmp
+        ;;
+    cr16 | cr16-*)
+        basic_machine=cr16-unknown
+        os=-elf
         ;;
     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
+        ;;
     da30 | da30-*)
         basic_machine=m68k-da30
@@ -396 +584 @@
     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 \
@@ -404 +600 @@
         basic_machine=m88k-motorola
         os=-sysv3
+        ;;
+    dicos)
+        basic_machine=i686-pc
+        os=-dicos
+        ;;
+    djgpp)
+        basic_machine=i586-pc
+        os=-msdosdjgpp
         ;;
     dpx20 | dpx20-*)
@@ -555 +759 @@
         os=-sysv
         ;;
+    m68knommu)
+        basic_machine=m68k-unknown
+        os=-linux
+        ;;
+    m68knommu-*)
+        basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
     m88k-omron*)
         basic_machine=m88k-omron
@@ -566 +778 @@
         os=-sysv
         ;;
+    microblaze)
+        basic_machine=microblaze-xilinx
+        ;;
     mingw32)
         basic_machine=i386-pc
         os=-mingw32
         ;;
+    mingw32ce)
+        basic_machine=arm-unknown
+        os=-mingw32ce
+        ;;
     miniframe)
         basic_machine=m68000-convergent
@@ -577 +796 @@
         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/'`
@@ -590 +801 @@
     mips3*)
         basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-        ;;
-    mmix*)
-        basic_machine=mmix-knuth
-        os=-mmixware
         ;;
     monitor)
@@ -599 +806 @@
         os=-coff
         ;;
+    morphos)
+        basic_machine=powerpc-unknown
+        os=-morphos
+        ;;
     msdos)
         basic_machine=i386-pc
         os=-msdos
         ;;
+    ms1-*)
+        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+        ;;
+    msys)
+        basic_machine=i386-pc
+        os=-msys
+        ;;
     mvs)
         basic_machine=i370-ibm
         os=-mvs
+        ;;
+    nacl)
+        basic_machine=le32-unknown
+        os=-nacl
         ;;
     ncr3000)
@@ -671 +893 @@
         basic_machine=np1-gould
         ;;
+    neo-tandem)
+        basic_machine=neo-tandem
+        ;;
+    nse-tandem)
+        basic_machine=nse-tandem
+        ;;
     nsr-tandem)
         basic_machine=nsr-tandem
@@ -678 +906 @@
         os=-proelf
         ;;
+    openrisc | openrisc-*)
+        basic_machine=or32-unknown
+        ;;
+    os400)
+        basic_machine=powerpc-ibm
+        os=-os400
+        ;;
     OSE68000 | ose68000)
         basic_machine=m68000-ericsson
@@ -694 +929 @@
         os=-osf
         ;;
+    parisc)
+        basic_machine=hppa-unknown
+        os=-linux
+        ;;
+    parisc-*)
+        basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
     pbd)
         basic_machine=sparc-tti
@@ -700 +943 @@
         basic_machine=m68k-tti
         ;;
-        pc532 | pc532-*)
+    pc532 | pc532-*)
         basic_machine=ns32k-pc532
         ;;
-    pentium | p5 | k5 | k6 | nexgen)
+    pc98)
+        basic_machine=i386-pc
+        ;;
+    pc98-*)
+        basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentium | p5 | k5 | k6 | nexgen | viac3)
         basic_machine=i586-pc
         ;;
-    pentiumpro | p6 | 6x86 | athlon)
+    pentiumpro | p6 | 6x86 | athlon | athlon_*)
         basic_machine=i686-pc
         ;;
-    pentiumii | pentium2)
+    pentiumii | pentium2 | pentiumiii | pentium3)
         basic_machine=i686-pc
         ;;
-    pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+    pentium4)
+        basic_machine=i786-pc
+        ;;
+    pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
         basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
@@ -718 +970 @@
         basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
-    pentiumii-* | pentium2-*)
+    pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
         basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentium4-*)
+        basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
     pn)
@@ -726 +981 @@
     power)  basic_machine=power-ibm
         ;;
-    ppc)    basic_machine=powerpc-unknown
-            ;;
-    ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+    ppc | ppcbe)    basic_machine=powerpc-unknown
+        ;;
+    ppc-* | ppcbe-*)
+        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)
@@ -743 +1009 @@
         os=-pw32
         ;;
+    rdos)
+        basic_machine=i386-pc
+        os=-rdos
+        ;;
     rom68k)
         basic_machine=m68k-rom68k
@@ -753 +1023 @@
         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
+        ;;
+    sde)
+        basic_machine=mipsisa32-sde
+        os=-elf
+        ;;
+    sei)
+        basic_machine=mips-sei
+        os=-seiux
+        ;;
     sequent)
         basic_machine=i386-sequent
@@ -764 +1054 @@
         os=-hms
         ;;
-    sparclite-wrs)
+    sh5el)
+        basic_machine=sh5le-unknown
+        ;;
+    sh64)
+        basic_machine=sh64-unknown
+        ;;
+    sparclite-wrs | simso-wrs)
         basic_machine=sparclite-wrs
         os=-vxworks
@@ -782 +1078 @@
         os=-sysv4
         ;;
+    strongarm-* | thumb-*)
+        basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
     sun2)
         basic_machine=m68000-sun
@@ -831 +1130 @@
         ;;
     t3e)
-        basic_machine=t3e-cray
+        basic_machine=alphaev5-cray
         os=-unicos
         ;;
-    tic54x | c54x*)
-        basic_machine=tic54x-unknown
-        os=-coff
+    t90)
+        basic_machine=t90-cray
+        os=-unicos
+        ;;
+    tile*)
+        basic_machine=$basic_machine-unknown
+        os=-linux-gnu
         ;;
     tx39)
@@ -844 +1147 @@
         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)
@@ -868 +1179 @@
         ;;
     vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+        basic_machine=f301-fujitsu
+        ;;
     vxworks960)
         basic_machine=i960-wrs
@@ -890 +1201 @@
         os=-proelf
         ;;
-    windows32)
-        basic_machine=i386-pc
-        os=-windows32-msvcrt
-        ;;
-    xmp)
-        basic_machine=xmp-cray
+    xbox)
+        basic_machine=i686-pc
+        os=-mingw32
+        ;;
+    xps | xps100)
+        basic_machine=xps100-honeywell
+        ;;
+    xscale-* | xscalee[bl]-*)
+        basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+        ;;
+    ymp)
+        basic_machine=ymp-cray
         os=-unicos
-        ;;
-        xps | xps100)
-        basic_machine=xps100-honeywell
         ;;
     z8k-*-coff)
         basic_machine=z8k-unknown
+        os=-sim
+        ;;
+    z80-*-coff)
+        basic_machine=z80-unknown
         os=-sim
         ;;
@@ -921 +1239 @@
         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)
@@ -947 +1261 @@
         basic_machine=we32k-att
         ;;
-    sh3 | sh4)
+    sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
         basic_machine=sh-unknown
         ;;
-    sparc | sparcv9 | sparcv9b)
+    sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
         basic_machine=sparc-sun
         ;;
-        cydra)
+    cydra)
         basic_machine=cydra-cydrome
         ;;
@@ -967 +1281 @@
     pmac | pmac-mpw)
         basic_machine=powerpc-apple
-        ;;
-    c4x*)
-        basic_machine=c4x-none
-        os=-coff
         ;;
     *-unknown)
@@ -998 +1308 @@
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+    # First match some system type aliases
+    # that might get confused with valid system types.
     # -solaris* is a basic system type, with this one exception.
+    -auroraux)
+        os=-auroraux
+        ;;
     -solaris1 | -solaris1.*)
         os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1021 +1334 @@
     # -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* \
+          | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+          | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+          | -sym* | -kopensolaris* \
           | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-          | -aos* \
+          | -aos* | -aros* \
           | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
           | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-          | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-          | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+          | -openbsd* | -solidbsd* \
+          | -ekkobsd* | -kfreebsd* | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
-          | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+          | -chorusos* | -chorusrdb* | -cegcc* \
+          | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+          | -mingw32* | -linux-gnu* | -linux-android* \
+          | -linux-newlib* | -linux-uclibc* \
+          | -uxpv* | -beos* | -mpeix* | -udk* \
+          | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
           | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-          | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+          | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+          | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+          | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
     # Remember, each alternative MUST END IN *, to match a version number.
         ;;
@@ -1048 +1370 @@
         esac
         ;;
+    -nto-qnx*)
+        ;;
     -nto*)
-        os=-nto-qnx
+        os=`echo $os | sed -e 's|nto|nto-qnx|'`
         ;;
     -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-          | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+          | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
           | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
         ;;
@@ -1058 +1382 @@
         os=`echo $os | sed -e 's|mac|macos|'`
         ;;
+    -linux-dietlibc)
+        os=-linux-dietlibc
+        ;;
     -linux*)
         os=`echo $os | sed -e 's|linux|linux-gnu|'`
@@ -1070 +1397 @@
         os=-openedition
         ;;
+    -os400*)
+        os=-os400
+        ;;
     -wince*)
         os=-wince
@@ -1088 +1418 @@
         os=-aos
         ;;
+    -atheos*)
+        os=-atheos
+        ;;
+    -syllable*)
+        os=-syllable
+        ;;
     -386bsd)
         os=-bsd
@@ -1094 +1430 @@
         os=-sysv
         ;;
+    -nova*)
+        os=-rtmk-nova
+        ;;
     -ns2 )
-            os=-nextstep2
+        os=-nextstep2
         ;;
     -nsk*)
@@ -1107 +1446 @@
         os=-sysv4
         ;;
+    -tpf*)
+        os=-tpf
+        ;;
     -triton*)
         os=-sysv3
@@ -1134 +1476 @@
         os=-xenix
         ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-            os=-mint
+    -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+        os=-mint
+        ;;
+    -aros*)
+        os=-aros
+        ;;
+    -kaos*)
+        os=-kaos
+        ;;
+    -zvmoe)
+        os=-zvmoe
+        ;;
+    -dicos*)
+        os=-dicos
+        ;;
+    -nacl*)
         ;;
     -none)
@@ -1159 +1515 @@
 
 case $basic_machine in
+    score-*)
+        os=-elf
+        ;;
+    spu-*)
+        os=-elf
+        ;;
     *-acorn)
         os=-riscix1.2
@@ -1168 +1530 @@
         os=-aout
         ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+    tic54x-*)
+        os=-coff
+        ;;
+    tic55x-*)
+        os=-coff
+        ;;
+    tic6x-*)
+        os=-coff
+        ;;
+    # This must come before the *-dec entry.
     pdp10-*)
         os=-tops20
         ;;
-        pdp11-*)
+    pdp11-*)
         os=-none
         ;;
@@ -1192 +1567 @@
         os=-aout
         ;;
+    mep-*)
+        os=-elf
+        ;;
     mips*-cisco)
         os=-elf
@@ -1198 +1576 @@
         os=-elf
         ;;
+    or32-*)
+        os=-coff
+        ;;
     *-tti)  # must be before sparc entry or we get the wrong os.
         os=-sysv3
@@ -1207 +1588 @@
         os=-beos
         ;;
+    *-haiku)
+        os=-haiku
+        ;;
     *-ibm)
         os=-aix
         ;;
+    *-knuth)
+        os=-mmixware
+        ;;
     *-wec)
         os=-proelf
@@ -1261 +1648 @@
         os=-nextstep3
         ;;
-        *-gould)
+    *-gould)
         os=-sysv
         ;;
-        *-highlevel)
+    *-highlevel)
         os=-bsd
         ;;
@@ -1270 +1657 @@
         os=-bsd
         ;;
-        *-sgi)
+    *-sgi)
         os=-irix
         ;;
-        *-siemens)
+    *-siemens)
         os=-sysv4
         ;;
@@ -1312 +1699 @@
                 vendor=sun
                 ;;
-            -aix*)
+            -cnk*|-aix*)
                 vendor=ibm
                 ;;
@@ -1342 +1729 @@
                 vendor=ibm
                 ;;
+            -os400*)
+                vendor=ibm
+                ;;
             -ptx*)
                 vendor=sequent
                 ;;
-            -vxsim* | -vxworks*)
+            -tpf*)
+                vendor=ibm
+                ;;
+            -vxsim* | -vxworks* | -windiss*)
                 vendor=wrs
                 ;;
@@ -1360 +1753 @@
                 vendor=atari
                 ;;
+            -vos*)
+                vendor=stratus
+                ;;
         esac
         basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
@@ -1366 +1762 @@
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables: