Index: autoconf/config.sub |
=================================================================== |
--- autoconf/config.sub (revision 137921) |
+++ autoconf/config.sub (working copy) |
@@ -1,10 +1,10 @@ |
#! /bin/sh |
# Configuration validation subroutine script. |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
-# Free Software Foundation, Inc. |
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
+# 2011 Free Software Foundation, Inc. |
-timestamp='2009-08-19' |
+timestamp='2011-08-15' |
# This file is (in principle) common to ALL GNU software. |
# The presence of a machine in this file suggests that SOME GNU software |
@@ -75,8 +75,9 @@ |
version="\ |
GNU config.sub ($timestamp) |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
-2002, 2003, 2004, 2005, 2006, 2007, 2008 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 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
@@ -123,8 +124,9 @@ |
# Here we must recognize all the valid KERNEL-OS combinations. |
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
case $maybe_os in |
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
+ 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 |
@@ -156,8 +158,8 @@ |
os= |
basic_machine=$1 |
;; |
- -bluegene*) |
- os=-cnk |
+ -bluegene*) |
+ os=-cnk |
;; |
-sim | -cisco | -oki | -wec | -winbond) |
os= |
@@ -173,10 +175,10 @@ |
os=-chorusos |
basic_machine=$1 |
;; |
- -chorusrdb) |
- os=-chorusrdb |
+ -chorusrdb) |
+ os=-chorusrdb |
basic_machine=$1 |
- ;; |
+ ;; |
-hiux*) |
os=-hiuxwe2 |
;; |
@@ -244,6 +246,7 @@ |
# Recognize the basic CPU types without company name. |
# Some are omitted here because they have special meanings below. |
1750a | 580 \ |
+ | 32e[bl] | 64e[bl] \ |
| a29k \ |
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
@@ -281,26 +284,39 @@ |
| moxie \ |
| mt \ |
| msp430 \ |
+ | nds32 | nds32le | nds32be \ |
| nios | nios2 \ |
| ns16k | ns32k \ |
+ | open8 \ |
| or32 \ |
| pdp10 | pdp11 | pj | pjl \ |
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
+ | powerpc | powerpc64 | powerpc64le | powerpcle \ |
| pyramid \ |
+ | 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 | strongarm \ |
- | tahoe | thumb | tic4x | tic80 | tron \ |
- | v850 | v850e \ |
+ | spu \ |
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
+ | ubicom32 \ |
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
| we32k \ |
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
+ | 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 |
os=-none |
@@ -311,6 +327,18 @@ |
basic_machine=mt-unknown |
;; |
+ strongarm | thumb | xscale) |
+ basic_machine=arm-unknown |
+ ;; |
+ |
+ xscaleeb) |
+ basic_machine=armeb-unknown |
+ ;; |
+ |
+ xscaleel) |
+ basic_machine=armel-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. |
@@ -324,6 +352,7 @@ |
;; |
# Recognize the basic CPU types with company name. |
580-* \ |
+ | 32e[bl]-* | 64e[bl]-* \ |
| a29k-* \ |
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
@@ -331,7 +360,7 @@ |
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
| avr-* | avr32-* \ |
| bfin-* | bs2000-* \ |
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
| clipper-* | craynv-* | cydra-* \ |
| d10v-* | d30v-* | dlx-* \ |
| elxsi-* \ |
@@ -365,24 +394,29 @@ |
| mmix-* \ |
| mt-* \ |
| msp430-* \ |
+ | nds32-* | nds32le-* | nds32be-* \ |
| nios-* | nios2-* \ |
| none-* | np1-* | ns16k-* | ns32k-* \ |
+ | open8-* \ |
| orion-* \ |
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
| pyramid-* \ |
- | romp-* | rs6000-* \ |
+ | 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-* | strongarm-* | sv1-* | sx?-* \ |
- | tahoe-* | thumb-* \ |
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
+ | tahoe-* \ |
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
+ | tile*-* \ |
| tron-* \ |
- | v850-* | v850e-* | vax-* \ |
+ | ubicom32-* \ |
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
+ | vax-* \ |
| we32k-* \ |
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
+ | x86-* | x86_64-* | xc16x-* | xps100-* \ |
| xstormy16-* | xtensa*-* \ |
| ymp-* \ |
| z8k-* | z80-*) |
@@ -407,7 +441,7 @@ |
basic_machine=a29k-amd |
os=-udi |
;; |
- abacus) |
+ abacus) |
basic_machine=abacus-unknown |
;; |
adobe68k) |
@@ -477,11 +511,20 @@ |
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) |
+ cegcc) |
basic_machine=arm-unknown |
os=-cegcc |
;; |
@@ -513,7 +556,7 @@ |
basic_machine=craynv-cray |
os=-unicosmp |
;; |
- cr16) |
+ cr16 | cr16-*) |
basic_machine=cr16-unknown |
os=-elf |
;; |
@@ -729,7 +772,7 @@ |
basic_machine=ns32k-utek |
os=-sysv |
;; |
- microblaze) |
+ microblaze) |
basic_machine=microblaze-xilinx |
;; |
mingw32) |
@@ -772,6 +815,10 @@ |
basic_machine=i370-ibm |
os=-mvs |
;; |
+ nacl) |
+ basic_machine=32el-unknown |
+ os=-nacl |
+ ;; |
ncr3000) |
basic_machine=i486-ncr |
os=-sysv4 |
@@ -836,6 +883,12 @@ |
np1) |
basic_machine=np1-gould |
;; |
+ neo-tandem) |
+ basic_machine=neo-tandem |
+ ;; |
+ nse-tandem) |
+ basic_machine=nse-tandem |
+ ;; |
nsr-tandem) |
basic_machine=nsr-tandem |
;; |
@@ -918,9 +971,10 @@ |
;; |
power) basic_machine=power-ibm |
;; |
- ppc) basic_machine=powerpc-unknown |
+ ppc | ppcbe) basic_machine=powerpc-unknown |
;; |
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
+ ppc-* | ppcbe-*) |
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
;; |
ppcle | powerpclittle | ppc-le | powerpc-little) |
basic_machine=powerpcle-unknown |
@@ -1014,6 +1068,9 @@ |
basic_machine=i860-stratus |
os=-sysv4 |
;; |
+ strongarm-* | thumb-*) |
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
+ ;; |
sun2) |
basic_machine=m68000-sun |
;; |
@@ -1070,20 +1127,8 @@ |
basic_machine=t90-cray |
os=-unicos |
;; |
- tic54x | c54x*) |
- basic_machine=tic54x-unknown |
- os=-coff |
- ;; |
- tic55x | c55x*) |
- basic_machine=tic55x-unknown |
- os=-coff |
- ;; |
- tic6x | c6x*) |
- basic_machine=tic6x-unknown |
- os=-coff |
- ;; |
tile*) |
- basic_machine=tile-unknown |
+ basic_machine=$basic_machine-unknown |
os=-linux-gnu |
;; |
tx39) |
@@ -1153,6 +1198,9 @@ |
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 |
@@ -1250,15 +1298,15 @@ |
if [ x"$os" != x"" ] |
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|'` |
;; |
- -auroraux) |
- os=-auroraux |
- ;; |
-solaris) |
os=-solaris2 |
;; |
@@ -1277,8 +1325,8 @@ |
# -sysv* is not here because it comes later, after sysvr4. |
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* | -sym* \ |
- | -kopensolaris* \ |
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
+ | -sym* | -kopensolaris* \ |
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
| -aos* | -aros* \ |
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
@@ -1291,7 +1339,8 @@ |
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
| -chorusos* | -chorusrdb* | -cegcc* \ |
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
+ | -mingw32* | -linux-gnu* | -linux-android* \ |
+ | -linux-newlib* | -linux-uclibc* \ |
| -uxpv* | -beos* | -mpeix* | -udk* \ |
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
@@ -1299,7 +1348,7 @@ |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
# Remember, each alternative MUST END IN *, to match a version number. |
;; |
-qnx*) |
@@ -1338,7 +1387,7 @@ |
-opened*) |
os=-openedition |
;; |
- -os400*) |
+ -os400*) |
os=-os400 |
;; |
-wince*) |
@@ -1387,7 +1436,7 @@ |
-sinix*) |
os=-sysv4 |
;; |
- -tpf*) |
+ -tpf*) |
os=-tpf |
;; |
-triton*) |
@@ -1432,6 +1481,8 @@ |
-dicos*) |
os=-dicos |
;; |
+ -nacl*) |
+ ;; |
-none) |
;; |
*) |
@@ -1454,10 +1505,10 @@ |
# system, and we'll never get to this point. |
case $basic_machine in |
- score-*) |
+ score-*) |
os=-elf |
;; |
- spu-*) |
+ spu-*) |
os=-elf |
;; |
*-acorn) |
@@ -1469,9 +1520,18 @@ |
arm*-semi) |
os=-aout |
;; |
- c4x-* | tic4x-*) |
- os=-coff |
+ c4x-* | tic4x-*) |
+ os=-coff |
;; |
+ tic54x-*) |
+ os=-coff |
+ ;; |
+ tic55x-*) |
+ os=-coff |
+ ;; |
+ tic6x-*) |
+ os=-coff |
+ ;; |
# This must come before the *-dec entry. |
pdp10-*) |
os=-tops20 |
@@ -1497,7 +1557,7 @@ |
m68*-cisco) |
os=-aout |
;; |
- mep-*) |
+ mep-*) |
os=-elf |
;; |
mips*-cisco) |
@@ -1524,7 +1584,7 @@ |
*-ibm) |
os=-aix |
;; |
- *-knuth) |
+ *-knuth) |
os=-mmixware |
;; |
*-wec) |