Search
lxdream.org :: lxdream/config.sub :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename config.sub
changeset 1199:62d0a21fac1c
prev525:eec1fd69a42c
author nkeynes
date Wed Dec 21 17:13:08 2011 +1000 (8 years ago)
permissions -rw-r--r--
last change Setup configure to detect/manage CC_FOR_BUILD
file annotate diff log raw
1.1 --- a/config.sub Sat Nov 17 01:30:01 2007 +0000
1.2 +++ b/config.sub Wed Dec 21 17:13:08 2011 +1000
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 Free Software Foundation,
1.8 -# Inc.
1.9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
1.10 +# 2011 Free Software Foundation, Inc.
1.11
1.12 -timestamp='2006-07-02'
1.13 +timestamp='2011-10-29'
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 @@ -32,13 +32,16 @@
1.18
1.19
1.20 # Please send patches to <config-patches@gnu.org>. Submit a context
1.21 -# diff and a properly formatted ChangeLog entry.
1.22 +# diff and a properly formatted GNU ChangeLog entry.
1.23 #
1.24 # Configuration subroutine to validate and canonicalize a configuration type.
1.25 # Supply the specified configuration type as an argument.
1.26 # If it is invalid, we print an error message on stderr and exit with code 1.
1.27 # Otherwise, we print the canonical config type on stdout and succeed.
1.28
1.29 +# You can get the latest version of this script from:
1.30 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1.31 +
1.32 # This file is supposed to be the same for all GNU packages
1.33 # and recognize all the CPU types, system types and aliases
1.34 # that are meaningful with *any* GNU software.
1.35 @@ -72,8 +75,9 @@
1.36 version="\
1.37 GNU config.sub ($timestamp)
1.38
1.39 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1.40 -Free Software Foundation, Inc.
1.41 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
1.42 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
1.43 +Software Foundation, Inc.
1.44
1.45 This is free software; see the source for copying conditions. There is NO
1.46 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1.47 @@ -120,8 +124,10 @@
1.48 # Here we must recognize all the valid KERNEL-OS combinations.
1.49 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1.50 case $maybe_os in
1.51 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
1.52 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
1.53 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
1.54 + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
1.55 + knetbsd*-gnu* | netbsd*-gnu* | \
1.56 + kopensolaris*-gnu* | \
1.57 storm-chaos* | os2-emx* | rtmk-nova*)
1.58 os=-$maybe_os
1.59 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1.60 @@ -148,10 +154,13 @@
1.61 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1.62 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1.63 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1.64 - -apple | -axis | -knuth | -cray)
1.65 + -apple | -axis | -knuth | -cray | -microblaze)
1.66 os=
1.67 basic_machine=$1
1.68 ;;
1.69 + -bluegene*)
1.70 + os=-cnk
1.71 + ;;
1.72 -sim | -cisco | -oki | -wec | -winbond)
1.73 os=
1.74 basic_machine=$1
1.75 @@ -166,10 +175,10 @@
1.76 os=-chorusos
1.77 basic_machine=$1
1.78 ;;
1.79 - -chorusrdb)
1.80 - os=-chorusrdb
1.81 + -chorusrdb)
1.82 + os=-chorusrdb
1.83 basic_machine=$1
1.84 - ;;
1.85 + ;;
1.86 -hiux*)
1.87 os=-hiuxwe2
1.88 ;;
1.89 @@ -242,20 +251,27 @@
1.90 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1.91 | am33_2.0 \
1.92 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1.93 + | be32 | be64 \
1.94 | bfin \
1.95 | c4x | clipper \
1.96 | d10v | d30v | dlx | dsp16xx \
1.97 - | fr30 | frv \
1.98 + | epiphany \
1.99 + | fido | fr30 | frv \
1.100 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1.101 + | hexagon \
1.102 | i370 | i860 | i960 | ia64 \
1.103 | ip2k | iq2000 \
1.104 + | le32 | le64 \
1.105 + | lm32 \
1.106 | m32c | m32r | m32rle | m68000 | m68k | m88k \
1.107 - | maxq | mb | microblaze | mcore \
1.108 + | maxq | mb | microblaze | mcore | mep | metag \
1.109 | mips | mipsbe | mipseb | mipsel | mipsle \
1.110 | mips16 \
1.111 | mips64 | mips64el \
1.112 + | mips64octeon | mips64octeonel \
1.113 + | mips64orion | mips64orionel \
1.114 + | mips64r5900 | mips64r5900el \
1.115 | mips64vr | mips64vrel \
1.116 - | mips64orion | mips64orionel \
1.117 | mips64vr4100 | mips64vr4100el \
1.118 | mips64vr4300 | mips64vr4300el \
1.119 | mips64vr5000 | mips64vr5000el \
1.120 @@ -268,27 +284,42 @@
1.121 | mipsisa64sr71k | mipsisa64sr71kel \
1.122 | mipstx39 | mipstx39el \
1.123 | mn10200 | mn10300 \
1.124 + | moxie \
1.125 | mt \
1.126 | msp430 \
1.127 + | nds32 | nds32le | nds32be \
1.128 | nios | nios2 \
1.129 | ns16k | ns32k \
1.130 + | open8 \
1.131 | or32 \
1.132 | pdp10 | pdp11 | pj | pjl \
1.133 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1.134 + | powerpc | powerpc64 | powerpc64le | powerpcle \
1.135 | pyramid \
1.136 - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1.137 + | rl78 | rx \
1.138 + | score \
1.139 + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1.140 | sh64 | sh64le \
1.141 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
1.142 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
1.143 - | spu | strongarm \
1.144 - | tahoe | thumb | tic4x | tic80 | tron \
1.145 - | v850 | v850e \
1.146 + | spu \
1.147 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
1.148 + | ubicom32 \
1.149 + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
1.150 | we32k \
1.151 - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
1.152 - | z8k)
1.153 + | x86 | xc16x | xstormy16 | xtensa \
1.154 + | z8k | z80)
1.155 basic_machine=$basic_machine-unknown
1.156 ;;
1.157 - m6811 | m68hc11 | m6812 | m68hc12)
1.158 + c54x)
1.159 + basic_machine=tic54x-unknown
1.160 + ;;
1.161 + c55x)
1.162 + basic_machine=tic55x-unknown
1.163 + ;;
1.164 + c6x)
1.165 + basic_machine=tic6x-unknown
1.166 + ;;
1.167 + m6811 | m68hc11 | m6812 | m68hc12 | picochip)
1.168 # Motorola 68HC11/12.
1.169 basic_machine=$basic_machine-unknown
1.170 os=-none
1.171 @@ -299,6 +330,18 @@
1.172 basic_machine=mt-unknown
1.173 ;;
1.174
1.175 + strongarm | thumb | xscale)
1.176 + basic_machine=arm-unknown
1.177 + ;;
1.178 +
1.179 + xscaleeb)
1.180 + basic_machine=armeb-unknown
1.181 + ;;
1.182 +
1.183 + xscaleel)
1.184 + basic_machine=armel-unknown
1.185 + ;;
1.186 +
1.187 # We use `pc' rather than `unknown'
1.188 # because (1) that's what they normally are, and
1.189 # (2) the word "unknown" tends to confuse beginning users.
1.190 @@ -318,24 +361,30 @@
1.191 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1.192 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1.193 | avr-* | avr32-* \
1.194 + | be32-* | be64-* \
1.195 | bfin-* | bs2000-* \
1.196 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1.197 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
1.198 | clipper-* | craynv-* | cydra-* \
1.199 | d10v-* | d30v-* | dlx-* \
1.200 | elxsi-* \
1.201 - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
1.202 + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1.203 | h8300-* | h8500-* \
1.204 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1.205 + | hexagon-* \
1.206 | i*86-* | i860-* | i960-* | ia64-* \
1.207 | ip2k-* | iq2000-* \
1.208 + | le32-* | le64-* \
1.209 + | lm32-* \
1.210 | m32c-* | m32r-* | m32rle-* \
1.211 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1.212 - | m88110-* | m88k-* | maxq-* | mcore-* \
1.213 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
1.214 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1.215 | mips16-* \
1.216 | mips64-* | mips64el-* \
1.217 + | mips64octeon-* | mips64octeonel-* \
1.218 + | mips64orion-* | mips64orionel-* \
1.219 + | mips64r5900-* | mips64r5900el-* \
1.220 | mips64vr-* | mips64vrel-* \
1.221 - | mips64orion-* | mips64orionel-* \
1.222 | mips64vr4100-* | mips64vr4100el-* \
1.223 | mips64vr4300-* | mips64vr4300el-* \
1.224 | mips64vr5000-* | mips64vr5000el-* \
1.225 @@ -350,27 +399,36 @@
1.226 | mmix-* \
1.227 | mt-* \
1.228 | msp430-* \
1.229 + | nds32-* | nds32le-* | nds32be-* \
1.230 | nios-* | nios2-* \
1.231 | none-* | np1-* | ns16k-* | ns32k-* \
1.232 + | open8-* \
1.233 | orion-* \
1.234 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1.235 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1.236 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
1.237 | pyramid-* \
1.238 - | romp-* | rs6000-* \
1.239 - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1.240 + | rl78-* | romp-* | rs6000-* | rx-* \
1.241 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1.242 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1.243 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1.244 | sparclite-* \
1.245 - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
1.246 - | tahoe-* | thumb-* \
1.247 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
1.248 + | tahoe-* \
1.249 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1.250 + | tile*-* \
1.251 | tron-* \
1.252 - | v850-* | v850e-* | vax-* \
1.253 + | ubicom32-* \
1.254 + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
1.255 + | vax-* \
1.256 | we32k-* \
1.257 - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
1.258 - | xstormy16-* | xtensa-* \
1.259 + | x86-* | x86_64-* | xc16x-* | xps100-* \
1.260 + | xstormy16-* | xtensa*-* \
1.261 | ymp-* \
1.262 - | z8k-*)
1.263 + | z8k-* | z80-*)
1.264 + ;;
1.265 + # Recognize the basic CPU types without company name, with glob match.
1.266 + xtensa*)
1.267 + basic_machine=$basic_machine-unknown
1.268 ;;
1.269 # Recognize the various machine names and aliases which stand
1.270 # for a CPU type and a company and sometimes even an OS.
1.271 @@ -388,7 +446,7 @@
1.272 basic_machine=a29k-amd
1.273 os=-udi
1.274 ;;
1.275 - abacus)
1.276 + abacus)
1.277 basic_machine=abacus-unknown
1.278 ;;
1.279 adobe68k)
1.280 @@ -434,6 +492,10 @@
1.281 basic_machine=m68k-apollo
1.282 os=-bsd
1.283 ;;
1.284 + aros)
1.285 + basic_machine=i386-pc
1.286 + os=-aros
1.287 + ;;
1.288 aux)
1.289 basic_machine=m68k-apple
1.290 os=-aux
1.291 @@ -442,10 +504,35 @@
1.292 basic_machine=ns32k-sequent
1.293 os=-dynix
1.294 ;;
1.295 + blackfin)
1.296 + basic_machine=bfin-unknown
1.297 + os=-linux
1.298 + ;;
1.299 + blackfin-*)
1.300 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
1.301 + os=-linux
1.302 + ;;
1.303 + bluegene*)
1.304 + basic_machine=powerpc-ibm
1.305 + os=-cnk
1.306 + ;;
1.307 + c54x-*)
1.308 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
1.309 + ;;
1.310 + c55x-*)
1.311 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
1.312 + ;;
1.313 + c6x-*)
1.314 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
1.315 + ;;
1.316 c90)
1.317 basic_machine=c90-cray
1.318 os=-unicos
1.319 ;;
1.320 + cegcc)
1.321 + basic_machine=arm-unknown
1.322 + os=-cegcc
1.323 + ;;
1.324 convex-c1)
1.325 basic_machine=c1-convex
1.326 os=-bsd
1.327 @@ -474,8 +561,8 @@
1.328 basic_machine=craynv-cray
1.329 os=-unicosmp
1.330 ;;
1.331 - cr16c)
1.332 - basic_machine=cr16c-unknown
1.333 + cr16 | cr16-*)
1.334 + basic_machine=cr16-unknown
1.335 os=-elf
1.336 ;;
1.337 crds | unos)
1.338 @@ -513,6 +600,10 @@
1.339 basic_machine=m88k-motorola
1.340 os=-sysv3
1.341 ;;
1.342 + dicos)
1.343 + basic_machine=i686-pc
1.344 + os=-dicos
1.345 + ;;
1.346 djgpp)
1.347 basic_machine=i586-pc
1.348 os=-msdosdjgpp
1.349 @@ -667,6 +758,14 @@
1.350 basic_machine=m68k-isi
1.351 os=-sysv
1.352 ;;
1.353 + m68knommu)
1.354 + basic_machine=m68k-unknown
1.355 + os=-linux
1.356 + ;;
1.357 + m68knommu-*)
1.358 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
1.359 + os=-linux
1.360 + ;;
1.361 m88k-omron*)
1.362 basic_machine=m88k-omron
1.363 ;;
1.364 @@ -678,10 +777,17 @@
1.365 basic_machine=ns32k-utek
1.366 os=-sysv
1.367 ;;
1.368 + microblaze)
1.369 + basic_machine=microblaze-xilinx
1.370 + ;;
1.371 mingw32)
1.372 basic_machine=i386-pc
1.373 os=-mingw32
1.374 ;;
1.375 + mingw32ce)
1.376 + basic_machine=arm-unknown
1.377 + os=-mingw32ce
1.378 + ;;
1.379 miniframe)
1.380 basic_machine=m68000-convergent
1.381 ;;
1.382 @@ -714,6 +820,10 @@
1.383 basic_machine=i370-ibm
1.384 os=-mvs
1.385 ;;
1.386 + nacl)
1.387 + basic_machine=le32-unknown
1.388 + os=-nacl
1.389 + ;;
1.390 ncr3000)
1.391 basic_machine=i486-ncr
1.392 os=-sysv4
1.393 @@ -778,6 +888,12 @@
1.394 np1)
1.395 basic_machine=np1-gould
1.396 ;;
1.397 + neo-tandem)
1.398 + basic_machine=neo-tandem
1.399 + ;;
1.400 + nse-tandem)
1.401 + basic_machine=nse-tandem
1.402 + ;;
1.403 nsr-tandem)
1.404 basic_machine=nsr-tandem
1.405 ;;
1.406 @@ -808,6 +924,14 @@
1.407 basic_machine=i860-intel
1.408 os=-osf
1.409 ;;
1.410 + parisc)
1.411 + basic_machine=hppa-unknown
1.412 + os=-linux
1.413 + ;;
1.414 + parisc-*)
1.415 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
1.416 + os=-linux
1.417 + ;;
1.418 pbd)
1.419 basic_machine=sparc-tti
1.420 ;;
1.421 @@ -852,9 +976,10 @@
1.422 ;;
1.423 power) basic_machine=power-ibm
1.424 ;;
1.425 - ppc) basic_machine=powerpc-unknown
1.426 + ppc | ppcbe) basic_machine=powerpc-unknown
1.427 ;;
1.428 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1.429 + ppc-* | ppcbe-*)
1.430 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1.431 ;;
1.432 ppcle | powerpclittle | ppc-le | powerpc-little)
1.433 basic_machine=powerpcle-unknown
1.434 @@ -909,6 +1034,10 @@
1.435 sb1el)
1.436 basic_machine=mipsisa64sb1el-unknown
1.437 ;;
1.438 + sde)
1.439 + basic_machine=mipsisa32-sde
1.440 + os=-elf
1.441 + ;;
1.442 sei)
1.443 basic_machine=mips-sei
1.444 os=-seiux
1.445 @@ -920,6 +1049,9 @@
1.446 basic_machine=sh-hitachi
1.447 os=-hms
1.448 ;;
1.449 + sh5el)
1.450 + basic_machine=sh5le-unknown
1.451 + ;;
1.452 sh64)
1.453 basic_machine=sh64-unknown
1.454 ;;
1.455 @@ -941,6 +1073,9 @@
1.456 basic_machine=i860-stratus
1.457 os=-sysv4
1.458 ;;
1.459 + strongarm-* | thumb-*)
1.460 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1.461 + ;;
1.462 sun2)
1.463 basic_machine=m68000-sun
1.464 ;;
1.465 @@ -997,17 +1132,9 @@
1.466 basic_machine=t90-cray
1.467 os=-unicos
1.468 ;;
1.469 - tic54x | c54x*)
1.470 - basic_machine=tic54x-unknown
1.471 - os=-coff
1.472 - ;;
1.473 - tic55x | c55x*)
1.474 - basic_machine=tic55x-unknown
1.475 - os=-coff
1.476 - ;;
1.477 - tic6x | c6x*)
1.478 - basic_machine=tic6x-unknown
1.479 - os=-coff
1.480 + tile*)
1.481 + basic_machine=$basic_machine-unknown
1.482 + os=-linux-gnu
1.483 ;;
1.484 tx39)
1.485 basic_machine=mipstx39-unknown
1.486 @@ -1076,6 +1203,9 @@
1.487 xps | xps100)
1.488 basic_machine=xps100-honeywell
1.489 ;;
1.490 + xscale-* | xscalee[bl]-*)
1.491 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1.492 + ;;
1.493 ymp)
1.494 basic_machine=ymp-cray
1.495 os=-unicos
1.496 @@ -1084,6 +1214,10 @@
1.497 basic_machine=z8k-unknown
1.498 os=-sim
1.499 ;;
1.500 + z80-*-coff)
1.501 + basic_machine=z80-unknown
1.502 + os=-sim
1.503 + ;;
1.504 none)
1.505 basic_machine=none-none
1.506 os=-none
1.507 @@ -1122,7 +1256,7 @@
1.508 we32k)
1.509 basic_machine=we32k-att
1.510 ;;
1.511 - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1.512 + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1.513 basic_machine=sh-unknown
1.514 ;;
1.515 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1.516 @@ -1169,9 +1303,12 @@
1.517 if [ x"$os" != x"" ]
1.518 then
1.519 case $os in
1.520 - # First match some system type aliases
1.521 - # that might get confused with valid system types.
1.522 + # First match some system type aliases
1.523 + # that might get confused with valid system types.
1.524 # -solaris* is a basic system type, with this one exception.
1.525 + -auroraux)
1.526 + os=-auroraux
1.527 + ;;
1.528 -solaris1 | -solaris1.*)
1.529 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1.530 ;;
1.531 @@ -1192,10 +1329,11 @@
1.532 # Each alternative MUST END IN A *, to match a version number.
1.533 # -sysv* is not here because it comes later, after sysvr4.
1.534 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1.535 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1.536 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1.537 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1.538 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1.539 + | -sym* | -kopensolaris* \
1.540 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1.541 - | -aos* \
1.542 + | -aos* | -aros* \
1.543 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1.544 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1.545 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1.546 @@ -1204,9 +1342,10 @@
1.547 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1.548 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1.549 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1.550 - | -chorusos* | -chorusrdb* \
1.551 + | -chorusos* | -chorusrdb* | -cegcc* \
1.552 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1.553 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1.554 + | -mingw32* | -linux-gnu* | -linux-android* \
1.555 + | -linux-newlib* | -linux-uclibc* \
1.556 | -uxpv* | -beos* | -mpeix* | -udk* \
1.557 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1.558 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1.559 @@ -1214,7 +1353,7 @@
1.560 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1.561 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1.562 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1.563 - | -skyos* | -haiku* | -rdos* | -toppers*)
1.564 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1.565 # Remember, each alternative MUST END IN *, to match a version number.
1.566 ;;
1.567 -qnx*)
1.568 @@ -1253,7 +1392,7 @@
1.569 -opened*)
1.570 os=-openedition
1.571 ;;
1.572 - -os400*)
1.573 + -os400*)
1.574 os=-os400
1.575 ;;
1.576 -wince*)
1.577 @@ -1302,7 +1441,7 @@
1.578 -sinix*)
1.579 os=-sysv4
1.580 ;;
1.581 - -tpf*)
1.582 + -tpf*)
1.583 os=-tpf
1.584 ;;
1.585 -triton*)
1.586 @@ -1344,6 +1483,11 @@
1.587 -zvmoe)
1.588 os=-zvmoe
1.589 ;;
1.590 + -dicos*)
1.591 + os=-dicos
1.592 + ;;
1.593 + -nacl*)
1.594 + ;;
1.595 -none)
1.596 ;;
1.597 *)
1.598 @@ -1366,7 +1510,10 @@
1.599 # system, and we'll never get to this point.
1.600
1.601 case $basic_machine in
1.602 - spu-*)
1.603 + score-*)
1.604 + os=-elf
1.605 + ;;
1.606 + spu-*)
1.607 os=-elf
1.608 ;;
1.609 *-acorn)
1.610 @@ -1378,8 +1525,17 @@
1.611 arm*-semi)
1.612 os=-aout
1.613 ;;
1.614 - c4x-* | tic4x-*)
1.615 - os=-coff
1.616 + c4x-* | tic4x-*)
1.617 + os=-coff
1.618 + ;;
1.619 + tic54x-*)
1.620 + os=-coff
1.621 + ;;
1.622 + tic55x-*)
1.623 + os=-coff
1.624 + ;;
1.625 + tic6x-*)
1.626 + os=-coff
1.627 ;;
1.628 # This must come before the *-dec entry.
1.629 pdp10-*)
1.630 @@ -1406,6 +1562,9 @@
1.631 m68*-cisco)
1.632 os=-aout
1.633 ;;
1.634 + mep-*)
1.635 + os=-elf
1.636 + ;;
1.637 mips*-cisco)
1.638 os=-elf
1.639 ;;
1.640 @@ -1430,7 +1589,7 @@
1.641 *-ibm)
1.642 os=-aix
1.643 ;;
1.644 - *-knuth)
1.645 + *-knuth)
1.646 os=-mmixware
1.647 ;;
1.648 *-wec)
1.649 @@ -1535,7 +1694,7 @@
1.650 -sunos*)
1.651 vendor=sun
1.652 ;;
1.653 - -aix*)
1.654 + -cnk*|-aix*)
1.655 vendor=ibm
1.656 ;;
1.657 -beos*)
.