Diff

Differences From Artifact [1f0ad14050]:

To Artifact [32f90ac76a]:


     1      1   #! /bin/sh
     2      2   # Configuration validation subroutine script.
     3      3   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     4         -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
            4  +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
            5  +#   Free Software Foundation, Inc.
     5      6   
     6         -timestamp='2005-07-08'
            7  +timestamp='2010-09-11'
     7      8   
     8      9   # This file is (in principle) common to ALL GNU software.
     9     10   # The presence of a machine in this file suggests that SOME GNU software
    10     11   # can handle that machine.  It does not imply ALL GNU software can.
    11     12   #
    12     13   # This file is free software; you can redistribute it and/or modify
    13     14   # it under the terms of the GNU General Public License as published by
................................................................................
    27     28   # As a special exception to the GNU General Public License, if you
    28     29   # distribute this file as part of a program that contains a
    29     30   # configuration script generated by Autoconf, you may include it under
    30     31   # the same distribution terms that you use for the rest of that program.
    31     32   
    32     33   
    33     34   # Please send patches to <config-patches@gnu.org>.  Submit a context
    34         -# diff and a properly formatted ChangeLog entry.
           35  +# diff and a properly formatted GNU ChangeLog entry.
    35     36   #
    36     37   # Configuration subroutine to validate and canonicalize a configuration type.
    37     38   # Supply the specified configuration type as an argument.
    38     39   # If it is invalid, we print an error message on stderr and exit with code 1.
    39     40   # Otherwise, we print the canonical config type on stdout and succeed.
    40     41   
           42  +# You can get the latest version of this script from:
           43  +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
           44  +
    41     45   # This file is supposed to be the same for all GNU packages
    42     46   # and recognize all the CPU types, system types and aliases
    43     47   # that are meaningful with *any* GNU software.
    44     48   # Each package is responsible for reporting which valid configurations
    45     49   # it does not support.  The user should be able to distinguish
    46     50   # a failure to support a valid configuration from a meaningless
    47     51   # configuration.
................................................................................
    67     71     -v, --version      print version number, then exit
    68     72   
    69     73   Report bugs and patches to <config-patches@gnu.org>."
    70     74   
    71     75   version="\
    72     76   GNU config.sub ($timestamp)
    73     77   
    74         -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    75         -Free Software Foundation, Inc.
           78  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
           79  +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
           80  +Software Foundation, Inc.
    76     81   
    77     82   This is free software; see the source for copying conditions.  There is NO
    78     83   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    79     84   
    80     85   help="
    81     86   Try \`$me --help' for more information."
    82     87   
................................................................................
   115    120       exit 1;;
   116    121   esac
   117    122   
   118    123   # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   119    124   # Here we must recognize all the valid KERNEL-OS combinations.
   120    125   maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   121    126   case $maybe_os in
   122         -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
   123         -  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
          127  +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
          128  +  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
          129  +  knetbsd*-gnu* | netbsd*-gnu* | \
          130  +  kopensolaris*-gnu* | \
          131  +  storm-chaos* | os2-emx* | rtmk-nova*)
   124    132       os=-$maybe_os
   125    133       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   126    134       ;;
   127    135     *)
   128    136       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
   129    137       if [ $basic_machine != $1 ]
   130    138       then os=`echo $1 | sed 's/.*-/-/'`
................................................................................
   142    150   		;;
   143    151   	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
   144    152   	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
   145    153   	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
   146    154   	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   147    155   	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   148    156   	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   149         -	-apple | -axis | -knuth | -cray)
          157  +	-apple | -axis | -knuth | -cray | -microblaze)
   150    158   		os=
   151    159   		basic_machine=$1
          160  +		;;
          161  +        -bluegene*)
          162  +	        os=-cnk
   152    163   		;;
   153    164   	-sim | -cisco | -oki | -wec | -winbond)
   154    165   		os=
   155    166   		basic_machine=$1
   156    167   		;;
   157    168   	-scout)
   158    169   		;;
................................................................................
   167    178    	-chorusrdb)
   168    179    		os=-chorusrdb
   169    180   		basic_machine=$1
   170    181    		;;
   171    182   	-hiux*)
   172    183   		os=-hiuxwe2
   173    184   		;;
          185  +	-sco6)
          186  +		os=-sco5v6
          187  +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
          188  +		;;
   174    189   	-sco5)
   175    190   		os=-sco3.2v5
   176    191   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   177    192   		;;
   178    193   	-sco4)
   179    194   		os=-sco3.2v4
   180    195   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   181    196   		;;
   182    197   	-sco3.2.[4-9]*)
   183    198   		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
   184    199   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   185    200   		;;
   186    201   	-sco3.2v[4-9]*)
          202  +		# Don't forget version if it is 3.2v4 or newer.
          203  +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
          204  +		;;
          205  +	-sco5v6*)
   187    206   		# Don't forget version if it is 3.2v4 or newer.
   188    207   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   189    208   		;;
   190    209   	-sco*)
   191    210   		os=-sco3.2v2
   192    211   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   193    212   		;;
................................................................................
   227    246   	# Recognize the basic CPU types without company name.
   228    247   	# Some are omitted here because they have special meanings below.
   229    248   	1750a | 580 \
   230    249   	| a29k \
   231    250   	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   232    251   	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   233    252   	| am33_2.0 \
   234         -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
          253  +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
   235    254   	| bfin \
   236    255   	| c4x | clipper \
   237    256   	| d10v | d30v | dlx | dsp16xx \
   238         -	| fr30 | frv \
          257  +	| fido | fr30 | frv \
   239    258   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   240    259   	| i370 | i860 | i960 | ia64 \
   241    260   	| ip2k | iq2000 \
   242         -	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
          261  +	| lm32 \
          262  +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
          263  +	| maxq | mb | microblaze | mcore | mep | metag \
   243    264   	| mips | mipsbe | mipseb | mipsel | mipsle \
   244    265   	| mips16 \
   245    266   	| mips64 | mips64el \
   246         -	| mips64vr | mips64vrel \
          267  +	| mips64octeon | mips64octeonel \
   247    268   	| mips64orion | mips64orionel \
          269  +	| mips64r5900 | mips64r5900el \
          270  +	| mips64vr | mips64vrel \
   248    271   	| mips64vr4100 | mips64vr4100el \
   249    272   	| mips64vr4300 | mips64vr4300el \
   250    273   	| mips64vr5000 | mips64vr5000el \
   251    274   	| mips64vr5900 | mips64vr5900el \
   252    275   	| mipsisa32 | mipsisa32el \
   253    276   	| mipsisa32r2 | mipsisa32r2el \
   254    277   	| mipsisa64 | mipsisa64el \
   255    278   	| mipsisa64r2 | mipsisa64r2el \
   256    279   	| mipsisa64sb1 | mipsisa64sb1el \
   257    280   	| mipsisa64sr71k | mipsisa64sr71kel \
   258    281   	| mipstx39 | mipstx39el \
   259    282   	| mn10200 | mn10300 \
   260         -	| ms1 \
          283  +	| moxie \
          284  +	| mt \
   261    285   	| msp430 \
          286  +	| nds32 | nds32le | nds32be \
          287  +	| nios | nios2 \
   262    288   	| ns16k | ns32k \
   263    289   	| or32 \
   264    290   	| pdp10 | pdp11 | pj | pjl \
   265    291   	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   266    292   	| pyramid \
   267         -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
          293  +	| rx \
          294  +	| score \
          295  +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   268    296   	| sh64 | sh64le \
   269         -	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
   270         -	| sparcv8 | sparcv9 | sparcv9b \
   271         -	| strongarm \
   272         -	| tahoe | thumb | tic4x | tic80 | tron \
          297  +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
          298  +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
          299  +	| spu | strongarm \
          300  +	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
          301  +	| ubicom32 \
   273    302   	| v850 | v850e \
   274    303   	| we32k \
   275         -	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
   276         -	| z8k)
          304  +	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
          305  +	| z8k | z80)
   277    306   		basic_machine=$basic_machine-unknown
   278    307   		;;
   279         -	m32c)
   280         -		basic_machine=$basic_machine-unknown
          308  +	c54x)
          309  +		basic_machine=tic54x-unknown
   281    310   		;;
   282         -	m6811 | m68hc11 | m6812 | m68hc12)
          311  +	c55x)
          312  +		basic_machine=tic55x-unknown
          313  +		;;
          314  +	c6x)
          315  +		basic_machine=tic6x-unknown
          316  +		;;
          317  +	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
   283    318   		# Motorola 68HC11/12.
   284    319   		basic_machine=$basic_machine-unknown
   285    320   		os=-none
   286    321   		;;
   287    322   	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   288    323   		;;
          324  +	ms1)
          325  +		basic_machine=mt-unknown
          326  +		;;
   289    327   
   290    328   	# We use `pc' rather than `unknown'
   291    329   	# because (1) that's what they normally are, and
   292    330   	# (2) the word "unknown" tends to confuse beginning users.
   293    331   	i*86 | x86_64)
   294    332   	  basic_machine=$basic_machine-pc
   295    333   	  ;;
................................................................................
   301    339   	# Recognize the basic CPU types with company name.
   302    340   	580-* \
   303    341   	| a29k-* \
   304    342   	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   305    343   	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   306    344   	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   307    345   	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   308         -	| avr-* \
          346  +	| avr-* | avr32-* \
   309    347   	| bfin-* | bs2000-* \
   310         -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
          348  +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
   311    349   	| clipper-* | craynv-* | cydra-* \
   312    350   	| d10v-* | d30v-* | dlx-* \
   313    351   	| elxsi-* \
   314         -	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
          352  +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   315    353   	| h8300-* | h8500-* \
   316    354   	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   317    355   	| i*86-* | i860-* | i960-* | ia64-* \
   318    356   	| ip2k-* | iq2000-* \
   319         -	| m32r-* | m32rle-* \
          357  +	| lm32-* \
          358  +	| m32c-* | m32r-* | m32rle-* \
   320    359   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   321         -	| m88110-* | m88k-* | maxq-* | mcore-* \
          360  +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
   322    361   	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   323    362   	| mips16-* \
   324    363   	| mips64-* | mips64el-* \
   325         -	| mips64vr-* | mips64vrel-* \
          364  +	| mips64octeon-* | mips64octeonel-* \
   326    365   	| mips64orion-* | mips64orionel-* \
          366  +	| mips64r5900-* | mips64r5900el-* \
          367  +	| mips64vr-* | mips64vrel-* \
   327    368   	| mips64vr4100-* | mips64vr4100el-* \
   328    369   	| mips64vr4300-* | mips64vr4300el-* \
   329    370   	| mips64vr5000-* | mips64vr5000el-* \
   330    371   	| mips64vr5900-* | mips64vr5900el-* \
   331    372   	| mipsisa32-* | mipsisa32el-* \
   332    373   	| mipsisa32r2-* | mipsisa32r2el-* \
   333    374   	| mipsisa64-* | mipsisa64el-* \
   334    375   	| mipsisa64r2-* | mipsisa64r2el-* \
   335    376   	| mipsisa64sb1-* | mipsisa64sb1el-* \
   336    377   	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   337    378   	| mipstx39-* | mipstx39el-* \
   338    379   	| mmix-* \
   339         -	| ms1-* \
          380  +	| mt-* \
   340    381   	| msp430-* \
          382  +	| nds32-* | nds32le-* | nds32be-* \
          383  +	| nios-* | nios2-* \
   341    384   	| none-* | np1-* | ns16k-* | ns32k-* \
   342    385   	| orion-* \
   343    386   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   344    387   	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   345    388   	| pyramid-* \
   346         -	| romp-* | rs6000-* \
   347         -	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
          389  +	| romp-* | rs6000-* | rx-* \
          390  +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   348    391   	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   349         -	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
          392  +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   350    393   	| sparclite-* \
   351         -	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
          394  +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   352    395   	| tahoe-* | thumb-* \
   353    396   	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
          397  +	| tile-* | tilegx-* \
   354    398   	| tron-* \
          399  +	| ubicom32-* \
   355    400   	| v850-* | v850e-* | vax-* \
   356    401   	| we32k-* \
   357         -	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
   358         -	| xstormy16-* | xtensa-* \
          402  +	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
          403  +	| xstormy16-* | xtensa*-* \
   359    404   	| ymp-* \
   360         -	| z8k-*)
          405  +	| z8k-* | z80-*)
   361    406   		;;
   362         -	m32c-*)
          407  +	# Recognize the basic CPU types without company name, with glob match.
          408  +	xtensa*)
          409  +		basic_machine=$basic_machine-unknown
   363    410   		;;
   364    411   	# Recognize the various machine names and aliases which stand
   365    412   	# for a CPU type and a company and sometimes even an OS.
   366    413   	386bsd)
   367    414   		basic_machine=i386-unknown
   368    415   		os=-bsd
   369    416   		;;
................................................................................
   419    466   		basic_machine=m68k-apollo
   420    467   		os=-sysv
   421    468   		;;
   422    469   	apollo68bsd)
   423    470   		basic_machine=m68k-apollo
   424    471   		os=-bsd
   425    472   		;;
          473  +	aros)
          474  +		basic_machine=i386-pc
          475  +		os=-aros
          476  +		;;
   426    477   	aux)
   427    478   		basic_machine=m68k-apple
   428    479   		os=-aux
   429    480   		;;
   430    481   	balance)
   431    482   		basic_machine=ns32k-sequent
   432    483   		os=-dynix
   433    484   		;;
          485  +	blackfin)
          486  +		basic_machine=bfin-unknown
          487  +		os=-linux
          488  +		;;
          489  +	blackfin-*)
          490  +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
          491  +		os=-linux
          492  +		;;
          493  +	bluegene*)
          494  +		basic_machine=powerpc-ibm
          495  +		os=-cnk
          496  +		;;
          497  +	c54x-*)
          498  +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
          499  +		;;
          500  +	c55x-*)
          501  +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
          502  +		;;
          503  +	c6x-*)
          504  +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
          505  +		;;
   434    506   	c90)
   435    507   		basic_machine=c90-cray
   436    508   		os=-unicos
          509  +		;;
          510  +        cegcc)
          511  +		basic_machine=arm-unknown
          512  +		os=-cegcc
   437    513   		;;
   438    514   	convex-c1)
   439    515   		basic_machine=c1-convex
   440    516   		os=-bsd
   441    517   		;;
   442    518   	convex-c2)
   443    519   		basic_machine=c2-convex
................................................................................
   459    535   		basic_machine=j90-cray
   460    536   		os=-unicos
   461    537   		;;
   462    538   	craynv)
   463    539   		basic_machine=craynv-cray
   464    540   		os=-unicosmp
   465    541   		;;
   466         -	cr16c)
   467         -		basic_machine=cr16c-unknown
          542  +	cr16)
          543  +		basic_machine=cr16-unknown
   468    544   		os=-elf
   469    545   		;;
   470    546   	crds | unos)
   471    547   		basic_machine=m68k-crds
   472    548   		;;
   473    549   	crisv32 | crisv32-* | etraxfs*)
   474    550   		basic_machine=crisv32-axis
................................................................................
   498    574   	      | 3300-motorola | delta-motorola)
   499    575   		basic_machine=m68k-motorola
   500    576   		;;
   501    577   	delta88)
   502    578   		basic_machine=m88k-motorola
   503    579   		os=-sysv3
   504    580   		;;
          581  +	dicos)
          582  +		basic_machine=i686-pc
          583  +		os=-dicos
          584  +		;;
   505    585   	djgpp)
   506    586   		basic_machine=i586-pc
   507    587   		os=-msdosdjgpp
   508    588   		;;
   509    589   	dpx20 | dpx20-*)
   510    590   		basic_machine=rs6000-bull
   511    591   		os=-bosx
................................................................................
   651    731   			os=-irix4
   652    732   			;;
   653    733   		esac
   654    734   		;;
   655    735   	isi68 | isi)
   656    736   		basic_machine=m68k-isi
   657    737   		os=-sysv
          738  +		;;
          739  +	m68knommu)
          740  +		basic_machine=m68k-unknown
          741  +		os=-linux
          742  +		;;
          743  +	m68knommu-*)
          744  +		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
          745  +		os=-linux
   658    746   		;;
   659    747   	m88k-omron*)
   660    748   		basic_machine=m88k-omron
   661    749   		;;
   662    750   	magnum | m3230)
   663    751   		basic_machine=mips-mips
   664    752   		os=-sysv
   665    753   		;;
   666    754   	merlin)
   667    755   		basic_machine=ns32k-utek
   668    756   		os=-sysv
   669    757   		;;
          758  +        microblaze)
          759  +		basic_machine=microblaze-xilinx
          760  +		;;
   670    761   	mingw32)
   671    762   		basic_machine=i386-pc
   672    763   		os=-mingw32
   673    764   		;;
          765  +	mingw32ce)
          766  +		basic_machine=arm-unknown
          767  +		os=-mingw32ce
          768  +		;;
   674    769   	miniframe)
   675    770   		basic_machine=m68000-convergent
   676    771   		;;
   677    772   	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   678    773   		basic_machine=m68k-atari
   679    774   		os=-mint
   680    775   		;;
................................................................................
   692    787   		basic_machine=powerpc-unknown
   693    788   		os=-morphos
   694    789   		;;
   695    790   	msdos)
   696    791   		basic_machine=i386-pc
   697    792   		os=-msdos
   698    793   		;;
          794  +	ms1-*)
          795  +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
          796  +		;;
   699    797   	mvs)
   700    798   		basic_machine=i370-ibm
   701    799   		os=-mvs
   702    800   		;;
   703    801   	ncr3000)
   704    802   		basic_machine=i486-ncr
   705    803   		os=-sysv4
................................................................................
   760    858   	nonstopux)
   761    859   		basic_machine=mips-compaq
   762    860   		os=-nonstopux
   763    861   		;;
   764    862   	np1)
   765    863   		basic_machine=np1-gould
   766    864   		;;
          865  +        neo-tandem)
          866  +		basic_machine=neo-tandem
          867  +		;;
          868  +        nse-tandem)
          869  +		basic_machine=nse-tandem
          870  +		;;
   767    871   	nsr-tandem)
   768    872   		basic_machine=nsr-tandem
   769    873   		;;
   770    874   	op50n-* | op60c-*)
   771    875   		basic_machine=hppa1.1-oki
   772    876   		os=-proelf
   773    877   		;;
................................................................................
   790    894   		basic_machine=hppa1.1-hitachi
   791    895   		os=-hiuxwe2
   792    896   		;;
   793    897   	paragon)
   794    898   		basic_machine=i860-intel
   795    899   		os=-osf
   796    900   		;;
          901  +	parisc)
          902  +		basic_machine=hppa-unknown
          903  +		os=-linux
          904  +		;;
          905  +	parisc-*)
          906  +		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
          907  +		os=-linux
          908  +		;;
   797    909   	pbd)
   798    910   		basic_machine=sparc-tti
   799    911   		;;
   800    912   	pbb)
   801    913   		basic_machine=m68k-tti
   802    914   		;;
   803    915   	pc532 | pc532-*)
   804    916   		basic_machine=ns32k-pc532
   805    917   		;;
          918  +	pc98)
          919  +		basic_machine=i386-pc
          920  +		;;
          921  +	pc98-*)
          922  +		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
          923  +		;;
   806    924   	pentium | p5 | k5 | k6 | nexgen | viac3)
   807    925   		basic_machine=i586-pc
   808    926   		;;
   809    927   	pentiumpro | p6 | 6x86 | athlon | athlon_*)
   810    928   		basic_machine=i686-pc
   811    929   		;;
   812    930   	pentiumii | pentium2 | pentiumiii | pentium3)
................................................................................
   855    973   	ps2)
   856    974   		basic_machine=i386-ibm
   857    975   		;;
   858    976   	pw32)
   859    977   		basic_machine=i586-unknown
   860    978   		os=-pw32
   861    979   		;;
          980  +	rdos)
          981  +		basic_machine=i386-pc
          982  +		os=-rdos
          983  +		;;
   862    984   	rom68k)
   863    985   		basic_machine=m68k-rom68k
   864    986   		os=-coff
   865    987   		;;
   866    988   	rm[46]00)
   867    989   		basic_machine=mips-siemens
   868    990   		;;
................................................................................
   881   1003   		;;
   882   1004   	sb1)
   883   1005   		basic_machine=mipsisa64sb1-unknown
   884   1006   		;;
   885   1007   	sb1el)
   886   1008   		basic_machine=mipsisa64sb1el-unknown
   887   1009   		;;
         1010  +	sde)
         1011  +		basic_machine=mipsisa32-sde
         1012  +		os=-elf
         1013  +		;;
   888   1014   	sei)
   889   1015   		basic_machine=mips-sei
   890   1016   		os=-seiux
   891   1017   		;;
   892   1018   	sequent)
   893   1019   		basic_machine=i386-sequent
   894   1020   		;;
   895   1021   	sh)
   896   1022   		basic_machine=sh-hitachi
   897   1023   		os=-hms
   898   1024   		;;
         1025  +	sh5el)
         1026  +		basic_machine=sh5le-unknown
         1027  +		;;
   899   1028   	sh64)
   900   1029   		basic_machine=sh64-unknown
   901   1030   		;;
   902   1031   	sparclite-wrs | simso-wrs)
   903   1032   		basic_machine=sparclite-wrs
   904   1033   		os=-vxworks
   905   1034   		;;
................................................................................
   969   1098   		basic_machine=alphaev5-cray
   970   1099   		os=-unicos
   971   1100   		;;
   972   1101   	t90)
   973   1102   		basic_machine=t90-cray
   974   1103   		os=-unicos
   975   1104   		;;
   976         -	tic54x | c54x*)
   977         -		basic_machine=tic54x-unknown
   978         -		os=-coff
         1105  +        # This must be matched before tile*.
         1106  +        tilegx*)
         1107  +		basic_machine=tilegx-unknown
         1108  +		os=-linux-gnu
   979   1109   		;;
   980         -	tic55x | c55x*)
   981         -		basic_machine=tic55x-unknown
   982         -		os=-coff
   983         -		;;
   984         -	tic6x | c6x*)
   985         -		basic_machine=tic6x-unknown
   986         -		os=-coff
         1110  +	tile*)
         1111  +		basic_machine=tile-unknown
         1112  +		os=-linux-gnu
   987   1113   		;;
   988   1114   	tx39)
   989   1115   		basic_machine=mipstx39-unknown
   990   1116   		;;
   991   1117   	tx39el)
   992   1118   		basic_machine=mipstx39el-unknown
   993   1119   		;;
................................................................................
  1056   1182   		basic_machine=ymp-cray
  1057   1183   		os=-unicos
  1058   1184   		;;
  1059   1185   	z8k-*-coff)
  1060   1186   		basic_machine=z8k-unknown
  1061   1187   		os=-sim
  1062   1188   		;;
         1189  +	z80-*-coff)
         1190  +		basic_machine=z80-unknown
         1191  +		os=-sim
         1192  +		;;
  1063   1193   	none)
  1064   1194   		basic_machine=none-none
  1065   1195   		os=-none
  1066   1196   		;;
  1067   1197   
  1068   1198   # Here we handle the default manufacturer of certain CPU types.  It is in
  1069   1199   # some cases the only manufacturer, in others, it is the most popular.
................................................................................
  1094   1224   		;;
  1095   1225   	pdp11)
  1096   1226   		basic_machine=pdp11-dec
  1097   1227   		;;
  1098   1228   	we32k)
  1099   1229   		basic_machine=we32k-att
  1100   1230   		;;
  1101         -	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
         1231  +	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
  1102   1232   		basic_machine=sh-unknown
  1103   1233   		;;
  1104         -	sparc | sparcv8 | sparcv9 | sparcv9b)
         1234  +	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
  1105   1235   		basic_machine=sparc-sun
  1106   1236   		;;
  1107   1237   	cydra)
  1108   1238   		basic_machine=cydra-cydrome
  1109   1239   		;;
  1110   1240   	orion)
  1111   1241   		basic_machine=orion-highlevel
................................................................................
  1144   1274   
  1145   1275   if [ x"$os" != x"" ]
  1146   1276   then
  1147   1277   case $os in
  1148   1278           # First match some system type aliases
  1149   1279           # that might get confused with valid system types.
  1150   1280   	# -solaris* is a basic system type, with this one exception.
         1281  +        -auroraux)
         1282  +	        os=-auroraux
         1283  +		;;
  1151   1284   	-solaris1 | -solaris1.*)
  1152   1285   		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  1153   1286   		;;
  1154   1287   	-solaris)
  1155   1288   		os=-solaris2
  1156   1289   		;;
  1157   1290   	-svr4*)
................................................................................
  1164   1297   		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  1165   1298   		;;
  1166   1299   	# First accept the basic system types.
  1167   1300   	# The portable systems comes first.
  1168   1301   	# Each alternative MUST END IN A *, to match a version number.
  1169   1302   	# -sysv* is not here because it comes later, after sysvr4.
  1170   1303   	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  1171         -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  1172         -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
         1304  +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
         1305  +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
         1306  +	      | -sym* | -kopensolaris* \
  1173   1307   	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  1174         -	      | -aos* \
         1308  +	      | -aos* | -aros* \
  1175   1309   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  1176   1310   	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  1177         -	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
         1311  +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
         1312  +	      | -openbsd* | -solidbsd* \
  1178   1313   	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  1179   1314   	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  1180   1315   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  1181   1316   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  1182         -	      | -chorusos* | -chorusrdb* \
         1317  +	      | -chorusos* | -chorusrdb* | -cegcc* \
  1183   1318   	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  1184         -	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
         1319  +	      | -mingw32* | -linux-gnu* | -linux-android* \
         1320  +	      | -linux-newlib* | -linux-uclibc* \
         1321  +	      | -uxpv* | -beos* | -mpeix* | -udk* \
  1185   1322   	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  1186   1323   	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  1187   1324   	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  1188   1325   	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  1189   1326   	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  1190   1327   	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
  1191         -	      | -skyos* | -haiku*)
         1328  +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  1192   1329   	# Remember, each alternative MUST END IN *, to match a version number.
  1193   1330   		;;
  1194   1331   	-qnx*)
  1195   1332   		case $basic_machine in
  1196   1333   		    x86-* | i*86-*)
  1197   1334   			;;
  1198   1335   		    *)
................................................................................
  1314   1451   		;;
  1315   1452   	-kaos*)
  1316   1453   		os=-kaos
  1317   1454   		;;
  1318   1455   	-zvmoe)
  1319   1456   		os=-zvmoe
  1320   1457   		;;
         1458  +	-dicos*)
         1459  +		os=-dicos
         1460  +		;;
         1461  +        -nacl*)
         1462  +	        ;;
  1321   1463   	-none)
  1322   1464   		;;
  1323   1465   	*)
  1324   1466   		# Get rid of the `-' at the beginning of $os.
  1325   1467   		os=`echo $os | sed 's/[^-]*-//'`
  1326   1468   		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  1327   1469   		exit 1
................................................................................
  1336   1478   # Note that if you're going to try to match "-MANUFACTURER" here (say,
  1337   1479   # "-sun"), then you have to tell the case statement up towards the top
  1338   1480   # that MANUFACTURER isn't an operating system.  Otherwise, code above
  1339   1481   # will signal an error saying that MANUFACTURER isn't an operating
  1340   1482   # system, and we'll never get to this point.
  1341   1483   
  1342   1484   case $basic_machine in
         1485  +        score-*)
         1486  +		os=-elf
         1487  +		;;
         1488  +        spu-*)
         1489  +		os=-elf
         1490  +		;;
  1343   1491   	*-acorn)
  1344   1492   		os=-riscix1.2
  1345   1493   		;;
  1346   1494   	arm*-rebel)
  1347   1495   		os=-linux
  1348   1496   		;;
  1349   1497   	arm*-semi)
  1350   1498   		os=-aout
  1351   1499   		;;
  1352         -    c4x-* | tic4x-*)
  1353         -        os=-coff
  1354         -        ;;
         1500  +        c4x-* | tic4x-*)
         1501  +        	os=-coff
         1502  +		;;
         1503  +	tic54x-*)
         1504  +		os=-coff
         1505  +		;;
         1506  +	tic55x-*)
         1507  +		os=-coff
         1508  +		;;
         1509  +	tic6x-*)
         1510  +		os=-coff
         1511  +		;;
  1355   1512   	# This must come before the *-dec entry.
  1356   1513   	pdp10-*)
  1357   1514   		os=-tops20
  1358   1515   		;;
  1359   1516   	pdp11-*)
  1360   1517   		os=-none
  1361   1518   		;;
................................................................................
  1372   1529   		os=-sunos3
  1373   1530   		# This also exists in the configure program, but was not the
  1374   1531   		# default.
  1375   1532   		# os=-sunos4
  1376   1533   		;;
  1377   1534   	m68*-cisco)
  1378   1535   		os=-aout
         1536  +		;;
         1537  +        mep-*)
         1538  +		os=-elf
  1379   1539   		;;
  1380   1540   	mips*-cisco)
  1381   1541   		os=-elf
  1382   1542   		;;
  1383   1543   	mips*-*)
  1384   1544   		os=-elf
  1385   1545   		;;
................................................................................
  1502   1662   		case $os in
  1503   1663   			-riscix*)
  1504   1664   				vendor=acorn
  1505   1665   				;;
  1506   1666   			-sunos*)
  1507   1667   				vendor=sun
  1508   1668   				;;
  1509         -			-aix*)
         1669  +			-cnk*|-aix*)
  1510   1670   				vendor=ibm
  1511   1671   				;;
  1512   1672   			-beos*)
  1513   1673   				vendor=be
  1514   1674   				;;
  1515   1675   			-hpux*)
  1516   1676   				vendor=hp