config.sub
changeset 455 71f9ee6eaa9d
parent 220 e59707061bde
child 498 af656a0a0fb5
     1.1 --- a/config.sub	Wed Jun 25 21:29:51 2014 -0700
     1.2 +++ b/config.sub	Mon Jul 07 11:14:27 2014 -0700
     1.3 @@ -1,10 +1,10 @@
     1.4  #! /bin/sh
     1.5  # Configuration validation subroutine script.
     1.6  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     1.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     1.8 -#   Free Software Foundation, Inc.
     1.9 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    1.10 +#   2011, 2012 Free Software Foundation, Inc.
    1.11  
    1.12 -timestamp='2009-10-07'
    1.13 +timestamp='2012-08-18'
    1.14  
    1.15  # This file is (in principle) common to ALL GNU software.
    1.16  # The presence of a machine in this file suggests that SOME GNU software
    1.17 @@ -21,9 +21,7 @@
    1.18  # GNU General Public License for more details.
    1.19  #
    1.20  # You should have received a copy of the GNU General Public License
    1.21 -# along with this program; if not, write to the Free Software
    1.22 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    1.23 -# 02110-1301, USA.
    1.24 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    1.25  #
    1.26  # As a special exception to the GNU General Public License, if you
    1.27  # distribute this file as part of a program that contains a
    1.28 @@ -75,8 +73,9 @@
    1.29  version="\
    1.30  GNU config.sub ($timestamp)
    1.31  
    1.32 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    1.33 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    1.34 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    1.35 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    1.36 +Free Software Foundation, Inc.
    1.37  
    1.38  This is free software; see the source for copying conditions.  There is NO
    1.39  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.40 @@ -123,13 +122,18 @@
    1.41  # Here we must recognize all the valid KERNEL-OS combinations.
    1.42  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    1.43  case $maybe_os in
    1.44 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    1.45 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
    1.46 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
    1.47 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
    1.48 +  knetbsd*-gnu* | netbsd*-gnu* | \
    1.49    kopensolaris*-gnu* | \
    1.50    storm-chaos* | os2-emx* | rtmk-nova*)
    1.51      os=-$maybe_os
    1.52      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    1.53      ;;
    1.54 +  android-linux)
    1.55 +    os=-linux-android
    1.56 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    1.57 +    ;;
    1.58    *)
    1.59      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    1.60      if [ $basic_machine != $1 ]
    1.61 @@ -156,8 +160,8 @@
    1.62  		os=
    1.63  		basic_machine=$1
    1.64  		;;
    1.65 -        -bluegene*)
    1.66 -	        os=-cnk
    1.67 +	-bluegene*)
    1.68 +		os=-cnk
    1.69  		;;
    1.70  	-sim | -cisco | -oki | -wec | -winbond)
    1.71  		os=
    1.72 @@ -173,10 +177,10 @@
    1.73  		os=-chorusos
    1.74  		basic_machine=$1
    1.75  		;;
    1.76 - 	-chorusrdb)
    1.77 - 		os=-chorusrdb
    1.78 +	-chorusrdb)
    1.79 +		os=-chorusrdb
    1.80  		basic_machine=$1
    1.81 - 		;;
    1.82 +		;;
    1.83  	-hiux*)
    1.84  		os=-hiuxwe2
    1.85  		;;
    1.86 @@ -221,6 +225,12 @@
    1.87  	-isc*)
    1.88  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    1.89  		;;
    1.90 +	-lynx*178)
    1.91 +		os=-lynxos178
    1.92 +		;;
    1.93 +	-lynx*5)
    1.94 +		os=-lynxos5
    1.95 +		;;
    1.96  	-lynx*)
    1.97  		os=-lynxos
    1.98  		;;
    1.99 @@ -245,17 +255,22 @@
   1.100  	# Some are omitted here because they have special meanings below.
   1.101  	1750a | 580 \
   1.102  	| a29k \
   1.103 +	| aarch64 | aarch64_be \
   1.104  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   1.105  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   1.106  	| am33_2.0 \
   1.107  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
   1.108 +        | be32 | be64 \
   1.109  	| bfin \
   1.110  	| c4x | clipper \
   1.111  	| d10v | d30v | dlx | dsp16xx \
   1.112 +	| epiphany \
   1.113  	| fido | fr30 | frv \
   1.114  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   1.115 +	| hexagon \
   1.116  	| i370 | i860 | i960 | ia64 \
   1.117  	| ip2k | iq2000 \
   1.118 +	| le32 | le64 \
   1.119  	| lm32 \
   1.120  	| m32c | m32r | m32rle | m68000 | m68k | m88k \
   1.121  	| maxq | mb | microblaze | mcore | mep | metag \
   1.122 @@ -281,28 +296,39 @@
   1.123  	| moxie \
   1.124  	| mt \
   1.125  	| msp430 \
   1.126 +	| nds32 | nds32le | nds32be \
   1.127  	| nios | nios2 \
   1.128  	| ns16k | ns32k \
   1.129 +	| open8 \
   1.130  	| or32 \
   1.131  	| pdp10 | pdp11 | pj | pjl \
   1.132 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   1.133 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
   1.134  	| pyramid \
   1.135 -	| rx \
   1.136 +	| rl78 | rx \
   1.137  	| score \
   1.138  	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   1.139  	| sh64 | sh64le \
   1.140  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
   1.141  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   1.142 -	| spu | strongarm \
   1.143 -	| tahoe | thumb | tic4x | tic80 | tron \
   1.144 -	| v850 | v850e \
   1.145 +	| spu \
   1.146 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
   1.147 +	| ubicom32 \
   1.148 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
   1.149  	| we32k \
   1.150 -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   1.151 +	| x86 | xc16x | xstormy16 | xtensa \
   1.152  	| z8k | z80)
   1.153  		basic_machine=$basic_machine-unknown
   1.154  		;;
   1.155 -	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
   1.156 -		# Motorola 68HC11/12.
   1.157 +	c54x)
   1.158 +		basic_machine=tic54x-unknown
   1.159 +		;;
   1.160 +	c55x)
   1.161 +		basic_machine=tic55x-unknown
   1.162 +		;;
   1.163 +	c6x)
   1.164 +		basic_machine=tic6x-unknown
   1.165 +		;;
   1.166 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
   1.167  		basic_machine=$basic_machine-unknown
   1.168  		os=-none
   1.169  		;;
   1.170 @@ -312,12 +338,40 @@
   1.171  		basic_machine=mt-unknown
   1.172  		;;
   1.173  
   1.174 +	strongarm | thumb | xscale)
   1.175 +		basic_machine=arm-unknown
   1.176 +		;;
   1.177 +	xgate)
   1.178 +		basic_machine=$basic_machine-unknown
   1.179 +		os=-none
   1.180 +		;;
   1.181 +	xscaleeb)
   1.182 +		basic_machine=armeb-unknown
   1.183 +		;;
   1.184 +
   1.185 +	xscaleel)
   1.186 +		basic_machine=armel-unknown
   1.187 +		;;
   1.188 +
   1.189  	# We use `pc' rather than `unknown'
   1.190  	# because (1) that's what they normally are, and
   1.191  	# (2) the word "unknown" tends to confuse beginning users.
   1.192  	i*86 | x86_64)
   1.193  	  basic_machine=$basic_machine-pc
   1.194  	  ;;
   1.195 +	nacl64*)
   1.196 +		basic_machine=x86_64-pc
   1.197 +		os=-nacl
   1.198 +		;;
   1.199 +	nacl*)
   1.200 +		basic_machine=i686-pc
   1.201 +		os=-nacl
   1.202 +		;;
   1.203 +	pnacl*)
   1.204 +		# le32-unknown-pnacl comes from http://www.chromium.org/nativeclient/pnacl/stability-of-the-pnacl-bitcode-abi
   1.205 +		basic_machine=le32-unknown
   1.206 +		os=-pnacl
   1.207 +		;;
   1.208  	# Object if more than one company name word.
   1.209  	*-*-*)
   1.210  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   1.211 @@ -326,21 +380,25 @@
   1.212  	# Recognize the basic CPU types with company name.
   1.213  	580-* \
   1.214  	| a29k-* \
   1.215 +	| aarch64-* | aarch64_be-* \
   1.216  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   1.217  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   1.218  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   1.219  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   1.220  	| avr-* | avr32-* \
   1.221 +	| be32-* | be64-* \
   1.222  	| bfin-* | bs2000-* \
   1.223 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
   1.224 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
   1.225  	| clipper-* | craynv-* | cydra-* \
   1.226  	| d10v-* | d30v-* | dlx-* \
   1.227  	| elxsi-* \
   1.228  	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   1.229  	| h8300-* | h8500-* \
   1.230  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   1.231 +	| hexagon-* \
   1.232  	| i*86-* | i860-* | i960-* | ia64-* \
   1.233  	| ip2k-* | iq2000-* \
   1.234 +	| le32-* | le64-* \
   1.235  	| lm32-* \
   1.236  	| m32c-* | m32r-* | m32rle-* \
   1.237  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   1.238 @@ -366,24 +424,29 @@
   1.239  	| mmix-* \
   1.240  	| mt-* \
   1.241  	| msp430-* \
   1.242 +	| nds32-* | nds32le-* | nds32be-* \
   1.243  	| nios-* | nios2-* \
   1.244  	| none-* | np1-* | ns16k-* | ns32k-* \
   1.245 +	| open8-* \
   1.246  	| orion-* \
   1.247  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   1.248 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   1.249 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
   1.250  	| pyramid-* \
   1.251 -	| romp-* | rs6000-* | rx-* \
   1.252 +	| rl78-* | romp-* | rs6000-* | rx-* \
   1.253  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   1.254  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   1.255  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   1.256  	| sparclite-* \
   1.257 -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   1.258 -	| tahoe-* | thumb-* \
   1.259 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
   1.260 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
   1.261 +	| tahoe-* \
   1.262 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   1.263 +	| tile*-* \
   1.264  	| tron-* \
   1.265 -	| v850-* | v850e-* | vax-* \
   1.266 +	| ubicom32-* \
   1.267 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
   1.268 +	| vax-* \
   1.269  	| we32k-* \
   1.270 -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
   1.271 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
   1.272  	| xstormy16-* | xtensa*-* \
   1.273  	| ymp-* \
   1.274  	| z8k-* | z80-*)
   1.275 @@ -408,7 +471,7 @@
   1.276  		basic_machine=a29k-amd
   1.277  		os=-udi
   1.278  		;;
   1.279 -    	abacus)
   1.280 +	abacus)
   1.281  		basic_machine=abacus-unknown
   1.282  		;;
   1.283  	adobe68k)
   1.284 @@ -478,11 +541,20 @@
   1.285  		basic_machine=powerpc-ibm
   1.286  		os=-cnk
   1.287  		;;
   1.288 +	c54x-*)
   1.289 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.290 +		;;
   1.291 +	c55x-*)
   1.292 +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.293 +		;;
   1.294 +	c6x-*)
   1.295 +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.296 +		;;
   1.297  	c90)
   1.298  		basic_machine=c90-cray
   1.299  		os=-unicos
   1.300  		;;
   1.301 -        cegcc)
   1.302 +	cegcc)
   1.303  		basic_machine=arm-unknown
   1.304  		os=-cegcc
   1.305  		;;
   1.306 @@ -514,7 +586,7 @@
   1.307  		basic_machine=craynv-cray
   1.308  		os=-unicosmp
   1.309  		;;
   1.310 -	cr16)
   1.311 +	cr16 | cr16-*)
   1.312  		basic_machine=cr16-unknown
   1.313  		os=-elf
   1.314  		;;
   1.315 @@ -672,7 +744,6 @@
   1.316  	i370-ibm* | ibm*)
   1.317  		basic_machine=i370-ibm
   1.318  		;;
   1.319 -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   1.320  	i*86v32)
   1.321  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   1.322  		os=-sysv32
   1.323 @@ -730,9 +801,13 @@
   1.324  		basic_machine=ns32k-utek
   1.325  		os=-sysv
   1.326  		;;
   1.327 -        microblaze)
   1.328 +	microblaze)
   1.329  		basic_machine=microblaze-xilinx
   1.330  		;;
   1.331 +	mingw64)
   1.332 +		basic_machine=x86_64-pc
   1.333 +		os=-mingw64
   1.334 +		;;
   1.335  	mingw32)
   1.336  		basic_machine=i386-pc
   1.337  		os=-mingw32
   1.338 @@ -769,10 +844,22 @@
   1.339  	ms1-*)
   1.340  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
   1.341  		;;
   1.342 +	msys)
   1.343 +		basic_machine=i386-pc
   1.344 +		os=-msys
   1.345 +		;;
   1.346  	mvs)
   1.347  		basic_machine=i370-ibm
   1.348  		os=-mvs
   1.349  		;;
   1.350 +	nacl)
   1.351 +		basic_machine=le32-unknown
   1.352 +		os=-nacl
   1.353 +		;;
   1.354 +	pnacl)
   1.355 +		basic_machine=le32-unknown
   1.356 +		os=-pnacl
   1.357 +		;;
   1.358  	ncr3000)
   1.359  		basic_machine=i486-ncr
   1.360  		os=-sysv4
   1.361 @@ -837,6 +924,12 @@
   1.362  	np1)
   1.363  		basic_machine=np1-gould
   1.364  		;;
   1.365 +	neo-tandem)
   1.366 +		basic_machine=neo-tandem
   1.367 +		;;
   1.368 +	nse-tandem)
   1.369 +		basic_machine=nse-tandem
   1.370 +		;;
   1.371  	nsr-tandem)
   1.372  		basic_machine=nsr-tandem
   1.373  		;;
   1.374 @@ -919,9 +1012,10 @@
   1.375  		;;
   1.376  	power)	basic_machine=power-ibm
   1.377  		;;
   1.378 -	ppc)	basic_machine=powerpc-unknown
   1.379 +	ppc | ppcbe)	basic_machine=powerpc-unknown
   1.380  		;;
   1.381 -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.382 +	ppc-* | ppcbe-*)
   1.383 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.384  		;;
   1.385  	ppcle | powerpclittle | ppc-le | powerpc-little)
   1.386  		basic_machine=powerpcle-unknown
   1.387 @@ -1015,6 +1109,9 @@
   1.388  		basic_machine=i860-stratus
   1.389  		os=-sysv4
   1.390  		;;
   1.391 +	strongarm-* | thumb-*)
   1.392 +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.393 +		;;
   1.394  	sun2)
   1.395  		basic_machine=m68000-sun
   1.396  		;;
   1.397 @@ -1071,20 +1168,8 @@
   1.398  		basic_machine=t90-cray
   1.399  		os=-unicos
   1.400  		;;
   1.401 -	tic54x | c54x*)
   1.402 -		basic_machine=tic54x-unknown
   1.403 -		os=-coff
   1.404 -		;;
   1.405 -	tic55x | c55x*)
   1.406 -		basic_machine=tic55x-unknown
   1.407 -		os=-coff
   1.408 -		;;
   1.409 -	tic6x | c6x*)
   1.410 -		basic_machine=tic6x-unknown
   1.411 -		os=-coff
   1.412 -		;;
   1.413  	tile*)
   1.414 -		basic_machine=tile-unknown
   1.415 +		basic_machine=$basic_machine-unknown
   1.416  		os=-linux-gnu
   1.417  		;;
   1.418  	tx39)
   1.419 @@ -1154,6 +1239,9 @@
   1.420  	xps | xps100)
   1.421  		basic_machine=xps100-honeywell
   1.422  		;;
   1.423 +	xscale-* | xscalee[bl]-*)
   1.424 +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
   1.425 +		;;
   1.426  	ymp)
   1.427  		basic_machine=ymp-cray
   1.428  		os=-unicos
   1.429 @@ -1251,9 +1339,12 @@
   1.430  if [ x"$os" != x"" ]
   1.431  then
   1.432  case $os in
   1.433 -        # First match some system type aliases
   1.434 -        # that might get confused with valid system types.
   1.435 +	# First match some system type aliases
   1.436 +	# that might get confused with valid system types.
   1.437  	# -solaris* is a basic system type, with this one exception.
   1.438 +	-auroraux)
   1.439 +		os=-auroraux
   1.440 +		;;
   1.441  	-solaris1 | -solaris1.*)
   1.442  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
   1.443  		;;
   1.444 @@ -1275,21 +1366,22 @@
   1.445  	# -sysv* is not here because it comes later, after sysvr4.
   1.446  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
   1.447  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
   1.448 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
   1.449 -	      | -kopensolaris* \
   1.450 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
   1.451 +	      | -sym* | -kopensolaris* \
   1.452  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
   1.453  	      | -aos* | -aros* \
   1.454  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
   1.455  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
   1.456  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
   1.457 -	      | -openbsd* | -solidbsd* \
   1.458 +	      | -bitrig* | -openbsd* | -solidbsd* \
   1.459  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
   1.460  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
   1.461  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
   1.462  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   1.463  	      | -chorusos* | -chorusrdb* | -cegcc* \
   1.464 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   1.465 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
   1.466 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   1.467 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
   1.468 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
   1.469  	      | -uxpv* | -beos* | -mpeix* | -udk* \
   1.470  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
   1.471  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   1.472 @@ -1309,6 +1401,12 @@
   1.473  			;;
   1.474  		esac
   1.475  		;;
   1.476 +	-nacl*)
   1.477 +		os=-nacl
   1.478 +		;;
   1.479 +	-pnacl*)
   1.480 +		os=-pnacl
   1.481 +		;;
   1.482  	-nto-qnx*)
   1.483  		;;
   1.484  	-nto*)
   1.485 @@ -1336,7 +1434,7 @@
   1.486  	-opened*)
   1.487  		os=-openedition
   1.488  		;;
   1.489 -        -os400*)
   1.490 +	-os400*)
   1.491  		os=-os400
   1.492  		;;
   1.493  	-wince*)
   1.494 @@ -1385,7 +1483,7 @@
   1.495  	-sinix*)
   1.496  		os=-sysv4
   1.497  		;;
   1.498 -        -tpf*)
   1.499 +	-tpf*)
   1.500  		os=-tpf
   1.501  		;;
   1.502  	-triton*)
   1.503 @@ -1430,6 +1528,12 @@
   1.504  	-dicos*)
   1.505  		os=-dicos
   1.506  		;;
   1.507 +	-nacl*)
   1.508 +        os=-nacl
   1.509 +        ;;
   1.510 +	-pnacl*)
   1.511 +		os=-pnacl
   1.512 +		;;
   1.513  	-none)
   1.514  		;;
   1.515  	*)
   1.516 @@ -1452,10 +1556,10 @@
   1.517  # system, and we'll never get to this point.
   1.518  
   1.519  case $basic_machine in
   1.520 -        score-*)
   1.521 +	score-*)
   1.522  		os=-elf
   1.523  		;;
   1.524 -        spu-*)
   1.525 +	spu-*)
   1.526  		os=-elf
   1.527  		;;
   1.528  	*-acorn)
   1.529 @@ -1467,8 +1571,20 @@
   1.530  	arm*-semi)
   1.531  		os=-aout
   1.532  		;;
   1.533 -        c4x-* | tic4x-*)
   1.534 -        	os=-coff
   1.535 +	c4x-* | tic4x-*)
   1.536 +		os=-coff
   1.537 +		;;
   1.538 +	hexagon-*)
   1.539 +		os=-elf
   1.540 +		;;
   1.541 +	tic54x-*)
   1.542 +		os=-coff
   1.543 +		;;
   1.544 +	tic55x-*)
   1.545 +		os=-coff
   1.546 +		;;
   1.547 +	tic6x-*)
   1.548 +		os=-coff
   1.549  		;;
   1.550  	# This must come before the *-dec entry.
   1.551  	pdp10-*)
   1.552 @@ -1488,14 +1604,11 @@
   1.553  		;;
   1.554  	m68000-sun)
   1.555  		os=-sunos3
   1.556 -		# This also exists in the configure program, but was not the
   1.557 -		# default.
   1.558 -		# os=-sunos4
   1.559  		;;
   1.560  	m68*-cisco)
   1.561  		os=-aout
   1.562  		;;
   1.563 -        mep-*)
   1.564 +	mep-*)
   1.565  		os=-elf
   1.566  		;;
   1.567  	mips*-cisco)
   1.568 @@ -1522,7 +1635,7 @@
   1.569  	*-ibm)
   1.570  		os=-aix
   1.571  		;;
   1.572 -    	*-knuth)
   1.573 +	*-knuth)
   1.574  		os=-mmixware
   1.575  		;;
   1.576  	*-wec)