diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | config.guess | 21 | ||||
-rwxr-xr-x | config.sub | 67 |
3 files changed, 64 insertions, 27 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20110127 | ||
2 | - (tim) [config.guess config.sub] Sync with upstream. | ||
3 | |||
1 | 20110125 | 4 | 20110125 |
2 | - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c | 5 | - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c |
3 | openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to | 6 | openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to |
diff --git a/config.guess b/config.guess index c2246a4f7..78553c4ea 100755 --- a/config.guess +++ b/config.guess | |||
@@ -1,10 +1,10 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
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 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
6 | 6 | ||
7 | timestamp='2009-12-30' | 7 | timestamp='2011-01-23' |
8 | 8 | ||
9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp) | |||
57 | 57 | ||
58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
61 | Software Foundation, Inc. | 61 | Software Foundation, Inc. |
62 | 62 | ||
63 | This is free software; see the source for copying conditions. There is NO | 63 | This is free software; see the source for copying conditions. There is NO |
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
270 | # A Xn.n version is an unreleased experimental baselevel. | 270 | # A Xn.n version is an unreleased experimental baselevel. |
271 | # 1.2 uses "1.2" for uname -r. | 271 | # 1.2 uses "1.2" for uname -r. |
272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
273 | exit ;; | 273 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
274 | exitcode=$? | ||
275 | trap '' 0 | ||
276 | exit $exitcode ;; | ||
274 | Alpha\ *:Windows_NT*:*) | 277 | Alpha\ *:Windows_NT*:*) |
275 | # How do we know it's Interix rather than the generic POSIX subsystem? | 278 | # How do we know it's Interix rather than the generic POSIX subsystem? |
276 | # Should we change UNAME_MACHINE based on the output of uname instead | 279 | # Should we change UNAME_MACHINE based on the output of uname instead |
@@ -552,7 +555,7 @@ EOF | |||
552 | echo rs6000-ibm-aix3.2 | 555 | echo rs6000-ibm-aix3.2 |
553 | fi | 556 | fi |
554 | exit ;; | 557 | exit ;; |
555 | *:AIX:*:[456]) | 558 | *:AIX:*:[4567]) |
556 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 559 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
557 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 560 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
558 | IBM_ARCH=rs6000 | 561 | IBM_ARCH=rs6000 |
@@ -968,6 +971,9 @@ EOF | |||
968 | sparc:Linux:*:* | sparc64:Linux:*:*) | 971 | sparc:Linux:*:* | sparc64:Linux:*:*) |
969 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 972 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
970 | exit ;; | 973 | exit ;; |
974 | tile*:Linux:*:*) | ||
975 | echo ${UNAME_MACHINE}-tilera-linux-gnu | ||
976 | exit ;; | ||
971 | vax:Linux:*:*) | 977 | vax:Linux:*:*) |
972 | echo ${UNAME_MACHINE}-dec-linux-gnu | 978 | echo ${UNAME_MACHINE}-dec-linux-gnu |
973 | exit ;; | 979 | exit ;; |
@@ -1231,6 +1237,9 @@ EOF | |||
1231 | *:QNX:*:4*) | 1237 | *:QNX:*:4*) |
1232 | echo i386-pc-qnx | 1238 | echo i386-pc-qnx |
1233 | exit ;; | 1239 | exit ;; |
1240 | NEO-?:NONSTOP_KERNEL:*:*) | ||
1241 | echo neo-tandem-nsk${UNAME_RELEASE} | ||
1242 | exit ;; | ||
1234 | NSE-?:NONSTOP_KERNEL:*:*) | 1243 | NSE-?:NONSTOP_KERNEL:*:*) |
1235 | echo nse-tandem-nsk${UNAME_RELEASE} | 1244 | echo nse-tandem-nsk${UNAME_RELEASE} |
1236 | exit ;; | 1245 | exit ;; |
diff --git a/config.sub b/config.sub index c2d125724..2d8169626 100755 --- a/config.sub +++ b/config.sub | |||
@@ -1,10 +1,10 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
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 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
6 | 6 | ||
7 | timestamp='2010-01-22' | 7 | timestamp='2011-01-01' |
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 |
@@ -124,8 +124,9 @@ esac | |||
124 | # Here we must recognize all the valid KERNEL-OS combinations. | 124 | # Here we must recognize all the valid KERNEL-OS combinations. |
125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
126 | case $maybe_os in | 126 | case $maybe_os in |
127 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 127 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
128 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 128 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
129 | knetbsd*-gnu* | netbsd*-gnu* | \ | ||
129 | kopensolaris*-gnu* | \ | 130 | kopensolaris*-gnu* | \ |
130 | storm-chaos* | os2-emx* | rtmk-nova*) | 131 | storm-chaos* | os2-emx* | rtmk-nova*) |
131 | os=-$maybe_os | 132 | os=-$maybe_os |
@@ -282,6 +283,7 @@ case $basic_machine in | |||
282 | | moxie \ | 283 | | moxie \ |
283 | | mt \ | 284 | | mt \ |
284 | | msp430 \ | 285 | | msp430 \ |
286 | | nds32 | nds32le | nds32be \ | ||
285 | | nios | nios2 \ | 287 | | nios | nios2 \ |
286 | | ns16k | ns32k \ | 288 | | ns16k | ns32k \ |
287 | | or32 \ | 289 | | or32 \ |
@@ -295,7 +297,7 @@ case $basic_machine in | |||
295 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 297 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 298 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
297 | | spu | strongarm \ | 299 | | spu | strongarm \ |
298 | | tahoe | thumb | tic4x | tic80 | tron \ | 300 | | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
299 | | ubicom32 \ | 301 | | ubicom32 \ |
300 | | v850 | v850e \ | 302 | | v850 | v850e \ |
301 | | we32k \ | 303 | | we32k \ |
@@ -303,6 +305,15 @@ case $basic_machine in | |||
303 | | z8k | z80) | 305 | | z8k | z80) |
304 | basic_machine=$basic_machine-unknown | 306 | basic_machine=$basic_machine-unknown |
305 | ;; | 307 | ;; |
308 | c54x) | ||
309 | basic_machine=tic54x-unknown | ||
310 | ;; | ||
311 | c55x) | ||
312 | basic_machine=tic55x-unknown | ||
313 | ;; | ||
314 | c6x) | ||
315 | basic_machine=tic6x-unknown | ||
316 | ;; | ||
306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 317 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
307 | # Motorola 68HC11/12. | 318 | # Motorola 68HC11/12. |
308 | basic_machine=$basic_machine-unknown | 319 | basic_machine=$basic_machine-unknown |
@@ -334,7 +345,7 @@ case $basic_machine in | |||
334 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 345 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
335 | | avr-* | avr32-* \ | 346 | | avr-* | avr32-* \ |
336 | | bfin-* | bs2000-* \ | 347 | | bfin-* | bs2000-* \ |
337 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 348 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
338 | | clipper-* | craynv-* | cydra-* \ | 349 | | clipper-* | craynv-* | cydra-* \ |
339 | | d10v-* | d30v-* | dlx-* \ | 350 | | d10v-* | d30v-* | dlx-* \ |
340 | | elxsi-* \ | 351 | | elxsi-* \ |
@@ -368,6 +379,7 @@ case $basic_machine in | |||
368 | | mmix-* \ | 379 | | mmix-* \ |
369 | | mt-* \ | 380 | | mt-* \ |
370 | | msp430-* \ | 381 | | msp430-* \ |
382 | | nds32-* | nds32le-* | nds32be-* \ | ||
371 | | nios-* | nios2-* \ | 383 | | nios-* | nios2-* \ |
372 | | none-* | np1-* | ns16k-* | ns32k-* \ | 384 | | none-* | np1-* | ns16k-* | ns32k-* \ |
373 | | orion-* \ | 385 | | orion-* \ |
@@ -482,6 +494,15 @@ case $basic_machine in | |||
482 | basic_machine=powerpc-ibm | 494 | basic_machine=powerpc-ibm |
483 | os=-cnk | 495 | os=-cnk |
484 | ;; | 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 | ;; | ||
485 | c90) | 506 | c90) |
486 | basic_machine=c90-cray | 507 | basic_machine=c90-cray |
487 | os=-unicos | 508 | os=-unicos |
@@ -518,7 +539,7 @@ case $basic_machine in | |||
518 | basic_machine=craynv-cray | 539 | basic_machine=craynv-cray |
519 | os=-unicosmp | 540 | os=-unicosmp |
520 | ;; | 541 | ;; |
521 | cr16) | 542 | cr16 | cr16-*) |
522 | basic_machine=cr16-unknown | 543 | basic_machine=cr16-unknown |
523 | os=-elf | 544 | os=-elf |
524 | ;; | 545 | ;; |
@@ -841,6 +862,12 @@ case $basic_machine in | |||
841 | np1) | 862 | np1) |
842 | basic_machine=np1-gould | 863 | basic_machine=np1-gould |
843 | ;; | 864 | ;; |
865 | neo-tandem) | ||
866 | basic_machine=neo-tandem | ||
867 | ;; | ||
868 | nse-tandem) | ||
869 | basic_machine=nse-tandem | ||
870 | ;; | ||
844 | nsr-tandem) | 871 | nsr-tandem) |
845 | basic_machine=nsr-tandem | 872 | basic_machine=nsr-tandem |
846 | ;; | 873 | ;; |
@@ -1075,18 +1102,6 @@ case $basic_machine in | |||
1075 | basic_machine=t90-cray | 1102 | basic_machine=t90-cray |
1076 | os=-unicos | 1103 | os=-unicos |
1077 | ;; | 1104 | ;; |
1078 | tic54x | c54x*) | ||
1079 | basic_machine=tic54x-unknown | ||
1080 | os=-coff | ||
1081 | ;; | ||
1082 | tic55x | c55x*) | ||
1083 | basic_machine=tic55x-unknown | ||
1084 | os=-coff | ||
1085 | ;; | ||
1086 | tic6x | c6x*) | ||
1087 | basic_machine=tic6x-unknown | ||
1088 | os=-coff | ||
1089 | ;; | ||
1090 | # This must be matched before tile*. | 1105 | # This must be matched before tile*. |
1091 | tilegx*) | 1106 | tilegx*) |
1092 | basic_machine=tilegx-unknown | 1107 | basic_machine=tilegx-unknown |
@@ -1301,7 +1316,8 @@ case $os in | |||
1301 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1316 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1302 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1317 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1303 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1318 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1304 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1319 | | -mingw32* | -linux-gnu* | -linux-android* \ |
1320 | | -linux-newlib* | -linux-uclibc* \ | ||
1305 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1321 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1306 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1322 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1307 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1323 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
@@ -1484,6 +1500,15 @@ case $basic_machine in | |||
1484 | c4x-* | tic4x-*) | 1500 | c4x-* | tic4x-*) |
1485 | os=-coff | 1501 | os=-coff |
1486 | ;; | 1502 | ;; |
1503 | tic54x-*) | ||
1504 | os=-coff | ||
1505 | ;; | ||
1506 | tic55x-*) | ||
1507 | os=-coff | ||
1508 | ;; | ||
1509 | tic6x-*) | ||
1510 | os=-coff | ||
1511 | ;; | ||
1487 | # This must come before the *-dec entry. | 1512 | # This must come before the *-dec entry. |
1488 | pdp10-*) | 1513 | pdp10-*) |
1489 | os=-tops20 | 1514 | os=-tops20 |