Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 65b655b

Browse files
committed
Update config.guess and config.sub
1 parent f674743 commit 65b655b

File tree

2 files changed

+61
-28
lines changed

2 files changed

+61
-28
lines changed

config/config.guess

100755100644
+29-17
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-04-02'
5+
timestamp='2017-05-11'
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."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
186186
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
187187
esac
188188
# The Operating System including object format, if it has switched
189-
# to ELF recently, or will in the future.
189+
# to ELF recently (or will in the future) and ABI.
190190
case "${UNAME_MACHINE_ARCH}" in
191-
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
191+
earm*)
192+
os=netbsdelf
193+
;;
194+
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
192195
eval $set_cc_for_build
193196
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
194197
| grep -q __ELF__
@@ -834,10 +837,11 @@ EOF
834837
UNAME_PROCESSOR=`/usr/bin/uname -p`
835838
case ${UNAME_PROCESSOR} in
836839
amd64)
837-
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
838-
*)
839-
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
840+
UNAME_PROCESSOR=x86_64 ;;
841+
i386)
842+
UNAME_PROCESSOR=i586 ;;
840843
esac
844+
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
841845
exit ;;
842846
i*:CYGWIN*:*)
843847
echo ${UNAME_MACHINE}-pc-cygwin
@@ -997,6 +1001,9 @@ EOF
9971001
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
9981002
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
9991003
;;
1004+
mips64el:Linux:*:*)
1005+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1006+
exit ;;
10001007
openrisc*:Linux:*:*)
10011008
echo or1k-unknown-linux-${LIBC}
10021009
exit ;;
@@ -1029,6 +1036,9 @@ EOF
10291036
ppcle:Linux:*:*)
10301037
echo powerpcle-unknown-linux-${LIBC}
10311038
exit ;;
1039+
riscv32:Linux:*:* | riscv64:Linux:*:*)
1040+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1041+
exit ;;
10321042
s390:Linux:*:* | s390x:Linux:*:*)
10331043
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
10341044
exit ;;
@@ -1325,15 +1335,18 @@ EOF
13251335
*:QNX:*:4*)
13261336
echo i386-pc-qnx
13271337
exit ;;
1328-
NEO-?:NONSTOP_KERNEL:*:*)
1338+
NEO-*:NONSTOP_KERNEL:*:*)
13291339
echo neo-tandem-nsk${UNAME_RELEASE}
13301340
exit ;;
13311341
NSE-*:NONSTOP_KERNEL:*:*)
13321342
echo nse-tandem-nsk${UNAME_RELEASE}
13331343
exit ;;
1334-
NSR-?:NONSTOP_KERNEL:*:*)
1344+
NSR-*:NONSTOP_KERNEL:*:*)
13351345
echo nsr-tandem-nsk${UNAME_RELEASE}
13361346
exit ;;
1347+
NSX-*:NONSTOP_KERNEL:*:*)
1348+
echo nsx-tandem-nsk${UNAME_RELEASE}
1349+
exit ;;
13371350
*:NonStop-UX:*:*)
13381351
echo mips-compaq-nonstopux
13391352
exit ;;
@@ -1408,18 +1421,17 @@ esac
14081421
cat >&2 <<EOF
14091422
$0: unable to guess system type
14101423
1411-
This script, last modified $timestamp, has failed to recognize
1412-
the operating system you are using. It is advised that you
1413-
download the most up to date version of the config scripts from
1424+
This script (version $timestamp), has failed to recognize the
1425+
operating system you are using. If your script is old, overwrite
1426+
config.guess and config.sub with the latest versions from:
14141427
14151428
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
14161429
and
14171430
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
14181431
1419-
If the version you run ($0) is already up to date, please
1420-
send the following data and any information you think might be
1421-
pertinent to <config-patches@gnu.org> in order to provide the needed
1422-
information to handle your system.
1432+
If $0 has already been updated, send the following data and any
1433+
information you think might be pertinent to config-patches@gnu.org to
1434+
provide the necessary information to handle your system.
14231435
14241436
config.guess timestamp = $timestamp
14251437

config/config.sub

100755100644
+32-11
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-03-30'
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 <config-patches@gnu.org>."
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."
@@ -117,7 +117,7 @@ case $maybe_os in
117117
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
118118
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
119119
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
120-
kopensolaris*-gnu* | \
120+
kopensolaris*-gnu* | cloudabi*-eabi* | \
121121
storm-chaos* | os2-emx* | rtmk-nova*)
122122
os=-$maybe_os
123123
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -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 \
@@ -301,6 +301,7 @@ case $basic_machine in
301301
| open8 | or1k | or1knd | or32 \
302302
| pdp10 | pdp11 | pj | pjl \
303303
| powerpc | powerpc64 | powerpc64le | powerpcle \
304+
| pru \
304305
| pyramid \
305306
| riscv32 | riscv64 \
306307
| rl78 | rx \
@@ -314,6 +315,7 @@ case $basic_machine in
314315
| ubicom32 \
315316
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
316317
| visium \
318+
| wasm32 \
317319
| we32k \
318320
| x86 | xc16x | xstormy16 | xtensa \
319321
| z8k | z80)
@@ -387,7 +389,7 @@ case $basic_machine in
387389
| h8300-* | h8500-* \
388390
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
389391
| hexagon-* \
390-
| i*86-* | i860-* | i960-* | ia64-* \
392+
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
391393
| ip2k-* | iq2000-* \
392394
| k1om-* \
393395
| le32-* | le64-* \
@@ -428,6 +430,7 @@ case $basic_machine in
428430
| orion-* \
429431
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
430432
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
433+
| pru-* \
431434
| pyramid-* \
432435
| riscv32-* | riscv64-* \
433436
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -444,6 +447,7 @@ case $basic_machine in
444447
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
445448
| vax-* \
446449
| visium-* \
450+
| wasm32-* \
447451
| we32k-* \
448452
| x86-* | x86_64-* | xc16x-* | xps100-* \
449453
| xstormy16-* | xtensa*-* \
@@ -643,6 +647,14 @@ case $basic_machine in
643647
basic_machine=m68k-bull
644648
os=-sysv3
645649
;;
650+
e500v[12])
651+
basic_machine=powerpc-unknown
652+
os=$os"spe"
653+
;;
654+
e500v[12]-*)
655+
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
656+
os=$os"spe"
657+
;;
646658
ebmon29k)
647659
basic_machine=a29k-amd
648660
os=-ebmon
@@ -938,6 +950,9 @@ case $basic_machine in
938950
nsr-tandem)
939951
basic_machine=nsr-tandem
940952
;;
953+
nsx-tandem)
954+
basic_machine=nsx-tandem
955+
;;
941956
op50n-* | op60c-*)
942957
basic_machine=hppa1.1-oki
943958
os=-proelf
@@ -1022,7 +1037,7 @@ case $basic_machine in
10221037
ppc-* | ppcbe-*)
10231038
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
10241039
;;
1025-
ppcle | powerpclittle | ppc-le | powerpc-little)
1040+
ppcle | powerpclittle)
10261041
basic_machine=powerpcle-unknown
10271042
;;
10281043
ppcle-* | powerpclittle-*)
@@ -1032,7 +1047,7 @@ case $basic_machine in
10321047
;;
10331048
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
10341049
;;
1035-
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1050+
ppc64le | powerpc64little)
10361051
basic_machine=powerpc64le-unknown
10371052
;;
10381053
ppc64le-* | powerpc64little-*)
@@ -1233,6 +1248,9 @@ case $basic_machine in
12331248
basic_machine=a29k-wrs
12341249
os=-vxworks
12351250
;;
1251+
wasm32)
1252+
basic_machine=wasm32-unknown
1253+
;;
12361254
w65*)
12371255
basic_machine=w65-wdc
12381256
os=-none
@@ -1387,9 +1405,9 @@ case $os in
13871405
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
13881406
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
13891407
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1390-
| -chorusos* | -chorusrdb* | -cegcc* \
1408+
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
13911409
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1392-
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1410+
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
13931411
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
13941412
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
13951413
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1417,7 @@ case $os in
13991417
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
14001418
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
14011419
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1402-
| -onefs* | -tirtos*)
1420+
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
14031421
# Remember, each alternative MUST END IN *, to match a version number.
14041422
;;
14051423
-qnx*)
@@ -1628,6 +1646,9 @@ case $basic_machine in
16281646
sparc-* | *-sun)
16291647
os=-sunos4.1.1
16301648
;;
1649+
pru-*)
1650+
os=-elf
1651+
;;
16311652
*-be)
16321653
os=-beos
16331654
;;

0 commit comments

Comments
 (0)