diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /config.sub | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'config.sub')
-rwxr-xr-x | config.sub | 190 |
1 files changed, 122 insertions, 68 deletions
diff --git a/config.sub b/config.sub index 2d8169626..eee8dccb0 100755 --- a/config.sub +++ b/config.sub | |||
@@ -2,9 +2,9 @@ | |||
2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
5 | # 2011 Free Software Foundation, Inc. | 5 | # 2011, 2012, 2013 Free Software Foundation, Inc. |
6 | 6 | ||
7 | timestamp='2011-01-01' | 7 | timestamp='2012-12-23' |
8 | 8 | ||
9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
@@ -21,9 +21,7 @@ timestamp='2011-01-01' | |||
21 | # GNU General Public License for more details. | 21 | # GNU General Public License for more details. |
22 | # | 22 | # |
23 | # You should have received a copy of the GNU General Public License | 23 | # You should have received a copy of the GNU General Public License |
24 | # along with this program; if not, write to the Free Software | 24 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
25 | # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
26 | # 02110-1301, USA. | ||
27 | # | 25 | # |
28 | # As a special exception to the GNU General Public License, if you | 26 | # As a special exception to the GNU General Public License, if you |
29 | # distribute this file as part of a program that contains a | 27 | # distribute this file as part of a program that contains a |
@@ -76,8 +74,8 @@ version="\ | |||
76 | GNU config.sub ($timestamp) | 74 | GNU config.sub ($timestamp) |
77 | 75 | ||
78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 76 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 77 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
80 | Software Foundation, Inc. | 78 | 2012, 2013 Free Software Foundation, Inc. |
81 | 79 | ||
82 | This is free software; see the source for copying conditions. There is NO | 80 | This is free software; see the source for copying conditions. There is NO |
83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 81 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
@@ -125,13 +123,17 @@ esac | |||
125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 123 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
126 | case $maybe_os in | 124 | case $maybe_os in |
127 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | 125 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
128 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | 126 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
129 | knetbsd*-gnu* | netbsd*-gnu* | \ | 127 | knetbsd*-gnu* | netbsd*-gnu* | \ |
130 | kopensolaris*-gnu* | \ | 128 | kopensolaris*-gnu* | \ |
131 | storm-chaos* | os2-emx* | rtmk-nova*) | 129 | storm-chaos* | os2-emx* | rtmk-nova*) |
132 | os=-$maybe_os | 130 | os=-$maybe_os |
133 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 131 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
134 | ;; | 132 | ;; |
133 | android-linux) | ||
134 | os=-linux-android | ||
135 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
136 | ;; | ||
135 | *) | 137 | *) |
136 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 138 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
137 | if [ $basic_machine != $1 ] | 139 | if [ $basic_machine != $1 ] |
@@ -154,12 +156,12 @@ case $os in | |||
154 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | 156 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
155 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | 157 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
156 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | 158 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
157 | -apple | -axis | -knuth | -cray | -microblaze) | 159 | -apple | -axis | -knuth | -cray | -microblaze*) |
158 | os= | 160 | os= |
159 | basic_machine=$1 | 161 | basic_machine=$1 |
160 | ;; | 162 | ;; |
161 | -bluegene*) | 163 | -bluegene*) |
162 | os=-cnk | 164 | os=-cnk |
163 | ;; | 165 | ;; |
164 | -sim | -cisco | -oki | -wec | -winbond) | 166 | -sim | -cisco | -oki | -wec | -winbond) |
165 | os= | 167 | os= |
@@ -175,10 +177,10 @@ case $os in | |||
175 | os=-chorusos | 177 | os=-chorusos |
176 | basic_machine=$1 | 178 | basic_machine=$1 |
177 | ;; | 179 | ;; |
178 | -chorusrdb) | 180 | -chorusrdb) |
179 | os=-chorusrdb | 181 | os=-chorusrdb |
180 | basic_machine=$1 | 182 | basic_machine=$1 |
181 | ;; | 183 | ;; |
182 | -hiux*) | 184 | -hiux*) |
183 | os=-hiuxwe2 | 185 | os=-hiuxwe2 |
184 | ;; | 186 | ;; |
@@ -223,6 +225,12 @@ case $os in | |||
223 | -isc*) | 225 | -isc*) |
224 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 226 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
225 | ;; | 227 | ;; |
228 | -lynx*178) | ||
229 | os=-lynxos178 | ||
230 | ;; | ||
231 | -lynx*5) | ||
232 | os=-lynxos5 | ||
233 | ;; | ||
226 | -lynx*) | 234 | -lynx*) |
227 | os=-lynxos | 235 | os=-lynxos |
228 | ;; | 236 | ;; |
@@ -247,20 +255,27 @@ case $basic_machine in | |||
247 | # Some are omitted here because they have special meanings below. | 255 | # Some are omitted here because they have special meanings below. |
248 | 1750a | 580 \ | 256 | 1750a | 580 \ |
249 | | a29k \ | 257 | | a29k \ |
258 | | aarch64 | aarch64_be \ | ||
250 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 259 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
251 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | 260 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
252 | | am33_2.0 \ | 261 | | am33_2.0 \ |
253 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | 262 | | arc \ |
263 | | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | ||
264 | | avr | avr32 \ | ||
265 | | be32 | be64 \ | ||
254 | | bfin \ | 266 | | bfin \ |
255 | | c4x | clipper \ | 267 | | c4x | clipper \ |
256 | | d10v | d30v | dlx | dsp16xx \ | 268 | | d10v | d30v | dlx | dsp16xx \ |
269 | | epiphany \ | ||
257 | | fido | fr30 | frv \ | 270 | | fido | fr30 | frv \ |
258 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 271 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
272 | | hexagon \ | ||
259 | | i370 | i860 | i960 | ia64 \ | 273 | | i370 | i860 | i960 | ia64 \ |
260 | | ip2k | iq2000 \ | 274 | | ip2k | iq2000 \ |
275 | | le32 | le64 \ | ||
261 | | lm32 \ | 276 | | lm32 \ |
262 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 277 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
263 | | maxq | mb | microblaze | mcore | mep | metag \ | 278 | | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ |
264 | | mips | mipsbe | mipseb | mipsel | mipsle \ | 279 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
265 | | mips16 \ | 280 | | mips16 \ |
266 | | mips64 | mips64el \ | 281 | | mips64 | mips64el \ |
@@ -286,22 +301,23 @@ case $basic_machine in | |||
286 | | nds32 | nds32le | nds32be \ | 301 | | nds32 | nds32le | nds32be \ |
287 | | nios | nios2 \ | 302 | | nios | nios2 \ |
288 | | ns16k | ns32k \ | 303 | | ns16k | ns32k \ |
304 | | open8 \ | ||
289 | | or32 \ | 305 | | or32 \ |
290 | | pdp10 | pdp11 | pj | pjl \ | 306 | | pdp10 | pdp11 | pj | pjl \ |
291 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 307 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
292 | | pyramid \ | 308 | | pyramid \ |
293 | | rx \ | 309 | | rl78 | rx \ |
294 | | score \ | 310 | | score \ |
295 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 311 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
296 | | sh64 | sh64le \ | 312 | | sh64 | sh64le \ |
297 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 313 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
298 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 314 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
299 | | spu | strongarm \ | 315 | | spu \ |
300 | | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | 316 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
301 | | ubicom32 \ | 317 | | ubicom32 \ |
302 | | v850 | v850e \ | 318 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
303 | | we32k \ | 319 | | we32k \ |
304 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 320 | | x86 | xc16x | xstormy16 | xtensa \ |
305 | | z8k | z80) | 321 | | z8k | z80) |
306 | basic_machine=$basic_machine-unknown | 322 | basic_machine=$basic_machine-unknown |
307 | ;; | 323 | ;; |
@@ -314,8 +330,7 @@ case $basic_machine in | |||
314 | c6x) | 330 | c6x) |
315 | basic_machine=tic6x-unknown | 331 | basic_machine=tic6x-unknown |
316 | ;; | 332 | ;; |
317 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 333 | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
318 | # Motorola 68HC11/12. | ||
319 | basic_machine=$basic_machine-unknown | 334 | basic_machine=$basic_machine-unknown |
320 | os=-none | 335 | os=-none |
321 | ;; | 336 | ;; |
@@ -325,6 +340,21 @@ case $basic_machine in | |||
325 | basic_machine=mt-unknown | 340 | basic_machine=mt-unknown |
326 | ;; | 341 | ;; |
327 | 342 | ||
343 | strongarm | thumb | xscale) | ||
344 | basic_machine=arm-unknown | ||
345 | ;; | ||
346 | xgate) | ||
347 | basic_machine=$basic_machine-unknown | ||
348 | os=-none | ||
349 | ;; | ||
350 | xscaleeb) | ||
351 | basic_machine=armeb-unknown | ||
352 | ;; | ||
353 | |||
354 | xscaleel) | ||
355 | basic_machine=armel-unknown | ||
356 | ;; | ||
357 | |||
328 | # We use `pc' rather than `unknown' | 358 | # We use `pc' rather than `unknown' |
329 | # because (1) that's what they normally are, and | 359 | # because (1) that's what they normally are, and |
330 | # (2) the word "unknown" tends to confuse beginning users. | 360 | # (2) the word "unknown" tends to confuse beginning users. |
@@ -339,11 +369,13 @@ case $basic_machine in | |||
339 | # Recognize the basic CPU types with company name. | 369 | # Recognize the basic CPU types with company name. |
340 | 580-* \ | 370 | 580-* \ |
341 | | a29k-* \ | 371 | | a29k-* \ |
372 | | aarch64-* | aarch64_be-* \ | ||
342 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | 373 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
343 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | 374 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
344 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | 375 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
345 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 376 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
346 | | avr-* | avr32-* \ | 377 | | avr-* | avr32-* \ |
378 | | be32-* | be64-* \ | ||
347 | | bfin-* | bs2000-* \ | 379 | | bfin-* | bs2000-* \ |
348 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ | 380 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
349 | | clipper-* | craynv-* | cydra-* \ | 381 | | clipper-* | craynv-* | cydra-* \ |
@@ -352,12 +384,15 @@ case $basic_machine in | |||
352 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | 384 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
353 | | h8300-* | h8500-* \ | 385 | | h8300-* | h8500-* \ |
354 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 386 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
387 | | hexagon-* \ | ||
355 | | i*86-* | i860-* | i960-* | ia64-* \ | 388 | | i*86-* | i860-* | i960-* | ia64-* \ |
356 | | ip2k-* | iq2000-* \ | 389 | | ip2k-* | iq2000-* \ |
390 | | le32-* | le64-* \ | ||
357 | | lm32-* \ | 391 | | lm32-* \ |
358 | | m32c-* | m32r-* | m32rle-* \ | 392 | | m32c-* | m32r-* | m32rle-* \ |
359 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 393 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
360 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | 394 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
395 | | microblaze-* | microblazeel-* \ | ||
361 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 396 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
362 | | mips16-* \ | 397 | | mips16-* \ |
363 | | mips64-* | mips64el-* \ | 398 | | mips64-* | mips64el-* \ |
@@ -382,24 +417,26 @@ case $basic_machine in | |||
382 | | nds32-* | nds32le-* | nds32be-* \ | 417 | | nds32-* | nds32le-* | nds32be-* \ |
383 | | nios-* | nios2-* \ | 418 | | nios-* | nios2-* \ |
384 | | none-* | np1-* | ns16k-* | ns32k-* \ | 419 | | none-* | np1-* | ns16k-* | ns32k-* \ |
420 | | open8-* \ | ||
385 | | orion-* \ | 421 | | orion-* \ |
386 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 422 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
387 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 423 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
388 | | pyramid-* \ | 424 | | pyramid-* \ |
389 | | romp-* | rs6000-* | rx-* \ | 425 | | rl78-* | romp-* | rs6000-* | rx-* \ |
390 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 426 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
391 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 427 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
392 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 428 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
393 | | sparclite-* \ | 429 | | sparclite-* \ |
394 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 430 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
395 | | tahoe-* | thumb-* \ | 431 | | tahoe-* \ |
396 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 432 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
397 | | tile-* | tilegx-* \ | 433 | | tile*-* \ |
398 | | tron-* \ | 434 | | tron-* \ |
399 | | ubicom32-* \ | 435 | | ubicom32-* \ |
400 | | v850-* | v850e-* | vax-* \ | 436 | | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
437 | | vax-* \ | ||
401 | | we32k-* \ | 438 | | we32k-* \ |
402 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 439 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
403 | | xstormy16-* | xtensa*-* \ | 440 | | xstormy16-* | xtensa*-* \ |
404 | | ymp-* \ | 441 | | ymp-* \ |
405 | | z8k-* | z80-*) | 442 | | z8k-* | z80-*) |
@@ -424,7 +461,7 @@ case $basic_machine in | |||
424 | basic_machine=a29k-amd | 461 | basic_machine=a29k-amd |
425 | os=-udi | 462 | os=-udi |
426 | ;; | 463 | ;; |
427 | abacus) | 464 | abacus) |
428 | basic_machine=abacus-unknown | 465 | basic_machine=abacus-unknown |
429 | ;; | 466 | ;; |
430 | adobe68k) | 467 | adobe68k) |
@@ -507,7 +544,7 @@ case $basic_machine in | |||
507 | basic_machine=c90-cray | 544 | basic_machine=c90-cray |
508 | os=-unicos | 545 | os=-unicos |
509 | ;; | 546 | ;; |
510 | cegcc) | 547 | cegcc) |
511 | basic_machine=arm-unknown | 548 | basic_machine=arm-unknown |
512 | os=-cegcc | 549 | os=-cegcc |
513 | ;; | 550 | ;; |
@@ -697,7 +734,6 @@ case $basic_machine in | |||
697 | i370-ibm* | ibm*) | 734 | i370-ibm* | ibm*) |
698 | basic_machine=i370-ibm | 735 | basic_machine=i370-ibm |
699 | ;; | 736 | ;; |
700 | # I'm not sure what "Sysv32" means. Should this be sysv3.2? | ||
701 | i*86v32) | 737 | i*86v32) |
702 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 738 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
703 | os=-sysv32 | 739 | os=-sysv32 |
@@ -755,9 +791,13 @@ case $basic_machine in | |||
755 | basic_machine=ns32k-utek | 791 | basic_machine=ns32k-utek |
756 | os=-sysv | 792 | os=-sysv |
757 | ;; | 793 | ;; |
758 | microblaze) | 794 | microblaze*) |
759 | basic_machine=microblaze-xilinx | 795 | basic_machine=microblaze-xilinx |
760 | ;; | 796 | ;; |
797 | mingw64) | ||
798 | basic_machine=x86_64-pc | ||
799 | os=-mingw64 | ||
800 | ;; | ||
761 | mingw32) | 801 | mingw32) |
762 | basic_machine=i386-pc | 802 | basic_machine=i386-pc |
763 | os=-mingw32 | 803 | os=-mingw32 |
@@ -794,10 +834,18 @@ case $basic_machine in | |||
794 | ms1-*) | 834 | ms1-*) |
795 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 835 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
796 | ;; | 836 | ;; |
837 | msys) | ||
838 | basic_machine=i386-pc | ||
839 | os=-msys | ||
840 | ;; | ||
797 | mvs) | 841 | mvs) |
798 | basic_machine=i370-ibm | 842 | basic_machine=i370-ibm |
799 | os=-mvs | 843 | os=-mvs |
800 | ;; | 844 | ;; |
845 | nacl) | ||
846 | basic_machine=le32-unknown | ||
847 | os=-nacl | ||
848 | ;; | ||
801 | ncr3000) | 849 | ncr3000) |
802 | basic_machine=i486-ncr | 850 | basic_machine=i486-ncr |
803 | os=-sysv4 | 851 | os=-sysv4 |
@@ -862,10 +910,10 @@ case $basic_machine in | |||
862 | np1) | 910 | np1) |
863 | basic_machine=np1-gould | 911 | basic_machine=np1-gould |
864 | ;; | 912 | ;; |
865 | neo-tandem) | 913 | neo-tandem) |
866 | basic_machine=neo-tandem | 914 | basic_machine=neo-tandem |
867 | ;; | 915 | ;; |
868 | nse-tandem) | 916 | nse-tandem) |
869 | basic_machine=nse-tandem | 917 | basic_machine=nse-tandem |
870 | ;; | 918 | ;; |
871 | nsr-tandem) | 919 | nsr-tandem) |
@@ -950,9 +998,10 @@ case $basic_machine in | |||
950 | ;; | 998 | ;; |
951 | power) basic_machine=power-ibm | 999 | power) basic_machine=power-ibm |
952 | ;; | 1000 | ;; |
953 | ppc) basic_machine=powerpc-unknown | 1001 | ppc | ppcbe) basic_machine=powerpc-unknown |
954 | ;; | 1002 | ;; |
955 | ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 1003 | ppc-* | ppcbe-*) |
1004 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
956 | ;; | 1005 | ;; |
957 | ppcle | powerpclittle | ppc-le | powerpc-little) | 1006 | ppcle | powerpclittle | ppc-le | powerpc-little) |
958 | basic_machine=powerpcle-unknown | 1007 | basic_machine=powerpcle-unknown |
@@ -977,7 +1026,11 @@ case $basic_machine in | |||
977 | basic_machine=i586-unknown | 1026 | basic_machine=i586-unknown |
978 | os=-pw32 | 1027 | os=-pw32 |
979 | ;; | 1028 | ;; |
980 | rdos) | 1029 | rdos | rdos64) |
1030 | basic_machine=x86_64-pc | ||
1031 | os=-rdos | ||
1032 | ;; | ||
1033 | rdos32) | ||
981 | basic_machine=i386-pc | 1034 | basic_machine=i386-pc |
982 | os=-rdos | 1035 | os=-rdos |
983 | ;; | 1036 | ;; |
@@ -1046,6 +1099,9 @@ case $basic_machine in | |||
1046 | basic_machine=i860-stratus | 1099 | basic_machine=i860-stratus |
1047 | os=-sysv4 | 1100 | os=-sysv4 |
1048 | ;; | 1101 | ;; |
1102 | strongarm-* | thumb-*) | ||
1103 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1104 | ;; | ||
1049 | sun2) | 1105 | sun2) |
1050 | basic_machine=m68000-sun | 1106 | basic_machine=m68000-sun |
1051 | ;; | 1107 | ;; |
@@ -1102,13 +1158,8 @@ case $basic_machine in | |||
1102 | basic_machine=t90-cray | 1158 | basic_machine=t90-cray |
1103 | os=-unicos | 1159 | os=-unicos |
1104 | ;; | 1160 | ;; |
1105 | # This must be matched before tile*. | ||
1106 | tilegx*) | ||
1107 | basic_machine=tilegx-unknown | ||
1108 | os=-linux-gnu | ||
1109 | ;; | ||
1110 | tile*) | 1161 | tile*) |
1111 | basic_machine=tile-unknown | 1162 | basic_machine=$basic_machine-unknown |
1112 | os=-linux-gnu | 1163 | os=-linux-gnu |
1113 | ;; | 1164 | ;; |
1114 | tx39) | 1165 | tx39) |
@@ -1178,6 +1229,9 @@ case $basic_machine in | |||
1178 | xps | xps100) | 1229 | xps | xps100) |
1179 | basic_machine=xps100-honeywell | 1230 | basic_machine=xps100-honeywell |
1180 | ;; | 1231 | ;; |
1232 | xscale-* | xscalee[bl]-*) | ||
1233 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | ||
1234 | ;; | ||
1181 | ymp) | 1235 | ymp) |
1182 | basic_machine=ymp-cray | 1236 | basic_machine=ymp-cray |
1183 | os=-unicos | 1237 | os=-unicos |
@@ -1275,11 +1329,11 @@ esac | |||
1275 | if [ x"$os" != x"" ] | 1329 | if [ x"$os" != x"" ] |
1276 | then | 1330 | then |
1277 | case $os in | 1331 | case $os in |
1278 | # First match some system type aliases | 1332 | # First match some system type aliases |
1279 | # that might get confused with valid system types. | 1333 | # that might get confused with valid system types. |
1280 | # -solaris* is a basic system type, with this one exception. | 1334 | # -solaris* is a basic system type, with this one exception. |
1281 | -auroraux) | 1335 | -auroraux) |
1282 | os=-auroraux | 1336 | os=-auroraux |
1283 | ;; | 1337 | ;; |
1284 | -solaris1 | -solaris1.*) | 1338 | -solaris1 | -solaris1.*) |
1285 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1339 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
@@ -1309,15 +1363,15 @@ case $os in | |||
1309 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1363 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1310 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1364 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1311 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1365 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
1312 | | -openbsd* | -solidbsd* \ | 1366 | | -bitrig* | -openbsd* | -solidbsd* \ |
1313 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1367 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
1314 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1368 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
1315 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1369 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1316 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1370 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1317 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1371 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1318 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1372 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1319 | | -mingw32* | -linux-gnu* | -linux-android* \ | 1373 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
1320 | | -linux-newlib* | -linux-uclibc* \ | 1374 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
1321 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1375 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1322 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1376 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1323 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1377 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
@@ -1364,7 +1418,7 @@ case $os in | |||
1364 | -opened*) | 1418 | -opened*) |
1365 | os=-openedition | 1419 | os=-openedition |
1366 | ;; | 1420 | ;; |
1367 | -os400*) | 1421 | -os400*) |
1368 | os=-os400 | 1422 | os=-os400 |
1369 | ;; | 1423 | ;; |
1370 | -wince*) | 1424 | -wince*) |
@@ -1413,7 +1467,7 @@ case $os in | |||
1413 | -sinix*) | 1467 | -sinix*) |
1414 | os=-sysv4 | 1468 | os=-sysv4 |
1415 | ;; | 1469 | ;; |
1416 | -tpf*) | 1470 | -tpf*) |
1417 | os=-tpf | 1471 | os=-tpf |
1418 | ;; | 1472 | ;; |
1419 | -triton*) | 1473 | -triton*) |
@@ -1458,8 +1512,8 @@ case $os in | |||
1458 | -dicos*) | 1512 | -dicos*) |
1459 | os=-dicos | 1513 | os=-dicos |
1460 | ;; | 1514 | ;; |
1461 | -nacl*) | 1515 | -nacl*) |
1462 | ;; | 1516 | ;; |
1463 | -none) | 1517 | -none) |
1464 | ;; | 1518 | ;; |
1465 | *) | 1519 | *) |
@@ -1482,10 +1536,10 @@ else | |||
1482 | # system, and we'll never get to this point. | 1536 | # system, and we'll never get to this point. |
1483 | 1537 | ||
1484 | case $basic_machine in | 1538 | case $basic_machine in |
1485 | score-*) | 1539 | score-*) |
1486 | os=-elf | 1540 | os=-elf |
1487 | ;; | 1541 | ;; |
1488 | spu-*) | 1542 | spu-*) |
1489 | os=-elf | 1543 | os=-elf |
1490 | ;; | 1544 | ;; |
1491 | *-acorn) | 1545 | *-acorn) |
@@ -1497,8 +1551,11 @@ case $basic_machine in | |||
1497 | arm*-semi) | 1551 | arm*-semi) |
1498 | os=-aout | 1552 | os=-aout |
1499 | ;; | 1553 | ;; |
1500 | c4x-* | tic4x-*) | 1554 | c4x-* | tic4x-*) |
1501 | os=-coff | 1555 | os=-coff |
1556 | ;; | ||
1557 | hexagon-*) | ||
1558 | os=-elf | ||
1502 | ;; | 1559 | ;; |
1503 | tic54x-*) | 1560 | tic54x-*) |
1504 | os=-coff | 1561 | os=-coff |
@@ -1527,14 +1584,11 @@ case $basic_machine in | |||
1527 | ;; | 1584 | ;; |
1528 | m68000-sun) | 1585 | m68000-sun) |
1529 | os=-sunos3 | 1586 | os=-sunos3 |
1530 | # This also exists in the configure program, but was not the | ||
1531 | # default. | ||
1532 | # os=-sunos4 | ||
1533 | ;; | 1587 | ;; |
1534 | m68*-cisco) | 1588 | m68*-cisco) |
1535 | os=-aout | 1589 | os=-aout |
1536 | ;; | 1590 | ;; |
1537 | mep-*) | 1591 | mep-*) |
1538 | os=-elf | 1592 | os=-elf |
1539 | ;; | 1593 | ;; |
1540 | mips*-cisco) | 1594 | mips*-cisco) |
@@ -1561,7 +1615,7 @@ case $basic_machine in | |||
1561 | *-ibm) | 1615 | *-ibm) |
1562 | os=-aix | 1616 | os=-aix |
1563 | ;; | 1617 | ;; |
1564 | *-knuth) | 1618 | *-knuth) |
1565 | os=-mmixware | 1619 | os=-mmixware |
1566 | ;; | 1620 | ;; |
1567 | *-wec) | 1621 | *-wec) |