Skip to content

Commit e3a0ce2

Browse files
authored
[3.5] trivial: update config.{guess,sub} from gnu.org. (GH-1987) (#1991)
* Update config.{guess,sub} from gnu.org.. (cherry picked from commit 6f46683)
1 parent ee9de30 commit e3a0ce2

File tree

2 files changed

+38
-16
lines changed

2 files changed

+38
-16
lines changed

config.guess

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2016 Free Software Foundation, Inc.
3+
# Copyright 1992-2017 Free Software Foundation, Inc.
44

5-
timestamp='2016-10-02'
5+
timestamp='2017-05-27'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2016 Free Software Foundation, Inc.
53+
Copyright 1992-2017 Free Software Foundation, Inc.
5454
5555
This is free software; see the source for copying conditions. There is NO
5656
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -837,10 +837,11 @@ EOF
837837
UNAME_PROCESSOR=`/usr/bin/uname -p`
838838
case ${UNAME_PROCESSOR} in
839839
amd64)
840-
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
841-
*)
842-
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
840+
UNAME_PROCESSOR=x86_64 ;;
841+
i386)
842+
UNAME_PROCESSOR=i586 ;;
843843
esac
844+
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
844845
exit ;;
845846
i*:CYGWIN*:*)
846847
echo ${UNAME_MACHINE}-pc-cygwin
@@ -1303,14 +1304,21 @@ EOF
13031304
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
13041305
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
13051306
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1306-
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1307-
grep IS_64BIT_ARCH >/dev/null
1307+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1308+
grep IS_64BIT_ARCH >/dev/null
13081309
then
13091310
case $UNAME_PROCESSOR in
13101311
i386) UNAME_PROCESSOR=x86_64 ;;
13111312
powerpc) UNAME_PROCESSOR=powerpc64 ;;
13121313
esac
13131314
fi
1315+
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1316+
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
1317+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1318+
grep IS_PPC >/dev/null
1319+
then
1320+
UNAME_PROCESSOR=powerpc
1321+
fi
13141322
fi
13151323
elif test "$UNAME_PROCESSOR" = i386 ; then
13161324
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1334,15 +1342,18 @@ EOF
13341342
*:QNX:*:4*)
13351343
echo i386-pc-qnx
13361344
exit ;;
1337-
NEO-?:NONSTOP_KERNEL:*:*)
1345+
NEO-*:NONSTOP_KERNEL:*:*)
13381346
echo neo-tandem-nsk${UNAME_RELEASE}
13391347
exit ;;
13401348
NSE-*:NONSTOP_KERNEL:*:*)
13411349
echo nse-tandem-nsk${UNAME_RELEASE}
13421350
exit ;;
1343-
NSR-?:NONSTOP_KERNEL:*:*)
1351+
NSR-*:NONSTOP_KERNEL:*:*)
13441352
echo nsr-tandem-nsk${UNAME_RELEASE}
13451353
exit ;;
1354+
NSX-*:NONSTOP_KERNEL:*:*)
1355+
echo nsx-tandem-nsk${UNAME_RELEASE}
1356+
exit ;;
13461357
*:NonStop-UX:*:*)
13471358
echo mips-compaq-nonstopux
13481359
exit ;;

config.sub

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright 1992-2016 Free Software Foundation, Inc.
3+
# Copyright 1992-2017 Free Software Foundation, Inc.
44

5-
timestamp='2016-11-19'
5+
timestamp='2017-04-02'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <[email protected]>."
6767
version="\
6868
GNU config.sub ($timestamp)
6969
70-
Copyright 1992-2016 Free Software Foundation, Inc.
70+
Copyright 1992-2017 Free Software Foundation, Inc.
7171
7272
This is free software; see the source for copying conditions. There is NO
7373
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -263,7 +263,7 @@ case $basic_machine in
263263
| fido | fr30 | frv | ft32 \
264264
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265265
| hexagon \
266-
| i370 | i860 | i960 | ia64 \
266+
| i370 | i860 | i960 | ia16 | ia64 \
267267
| ip2k | iq2000 \
268268
| k1om \
269269
| le32 | le64 \
@@ -315,6 +315,7 @@ case $basic_machine in
315315
| ubicom32 \
316316
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
317317
| visium \
318+
| wasm32 \
318319
| we32k \
319320
| x86 | xc16x | xstormy16 | xtensa \
320321
| z8k | z80)
@@ -388,7 +389,7 @@ case $basic_machine in
388389
| h8300-* | h8500-* \
389390
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
390391
| hexagon-* \
391-
| i*86-* | i860-* | i960-* | ia64-* \
392+
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
392393
| ip2k-* | iq2000-* \
393394
| k1om-* \
394395
| le32-* | le64-* \
@@ -446,6 +447,7 @@ case $basic_machine in
446447
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
447448
| vax-* \
448449
| visium-* \
450+
| wasm32-* \
449451
| we32k-* \
450452
| x86-* | x86_64-* | xc16x-* | xps100-* \
451453
| xstormy16-* | xtensa*-* \
@@ -948,6 +950,9 @@ case $basic_machine in
948950
nsr-tandem)
949951
basic_machine=nsr-tandem
950952
;;
953+
nsx-tandem)
954+
basic_machine=nsx-tandem
955+
;;
951956
op50n-* | op60c-*)
952957
basic_machine=hppa1.1-oki
953958
os=-proelf
@@ -1243,6 +1248,9 @@ case $basic_machine in
12431248
basic_machine=a29k-wrs
12441249
os=-vxworks
12451250
;;
1251+
wasm32)
1252+
basic_machine=wasm32-unknown
1253+
;;
12461254
w65*)
12471255
basic_machine=w65-wdc
12481256
os=-none
@@ -1409,7 +1417,7 @@ case $os in
14091417
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
14101418
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
14111419
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1412-
| -onefs* | -tirtos* | -phoenix* | -fuchsia*)
1420+
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
14131421
# Remember, each alternative MUST END IN *, to match a version number.
14141422
;;
14151423
-qnx*)
@@ -1638,6 +1646,9 @@ case $basic_machine in
16381646
sparc-* | *-sun)
16391647
os=-sunos4.1.1
16401648
;;
1649+
pru-*)
1650+
os=-elf
1651+
;;
16411652
*-be)
16421653
os=-beos
16431654
;;

0 commit comments

Comments
 (0)