Skip to content

Commit 87b8175

Browse files
committed
[depends] Latest config.guess & config.sub
1 parent bd3cbd5 commit 87b8175

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

depends/config.guess

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Attempt to guess a canonical system name.
33
# Copyright 1992-2016 Free Software Foundation, Inc.
44

5-
timestamp='2016-02-11'
5+
timestamp='2016-05-15'
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
@@ -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__
@@ -386,7 +389,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
386389
# This test works for both compilers.
387390
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
388391
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
389-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
392+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
390393
grep IS_64BIT_ARCH >/dev/null
391394
then
392395
SUN_ARCH=x86_64
@@ -684,7 +687,7 @@ EOF
684687
exit (0);
685688
}
686689
EOF
687-
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
690+
(CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
688691
test -z "$HP_ARCH" && HP_ARCH=hppa
689692
fi ;;
690693
esac
@@ -701,7 +704,7 @@ EOF
701704
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
702705
# => hppa64-hp-hpux11.23
703706

704-
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
707+
if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
705708
grep -q __LP64__
706709
then
707710
HP_ARCH=hppa2.0w
@@ -900,7 +903,7 @@ EOF
900903
exit ;;
901904
*:GNU/*:*:*)
902905
# other systems with GNU libc and userland
903-
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
906+
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
904907
exit ;;
905908
i*86:Minix:*:*)
906909
echo ${UNAME_MACHINE}-pc-minix
@@ -1276,6 +1279,9 @@ EOF
12761279
SX-8R:SUPER-UX:*:*)
12771280
echo sx8r-nec-superux${UNAME_RELEASE}
12781281
exit ;;
1282+
SX-ACE:SUPER-UX:*:*)
1283+
echo sxace-nec-superux${UNAME_RELEASE}
1284+
exit ;;
12791285
Power*:Rhapsody:*:*)
12801286
echo powerpc-apple-rhapsody${UNAME_RELEASE}
12811287
exit ;;
@@ -1291,7 +1297,7 @@ EOF
12911297
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
12921298
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
12931299
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1294-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1300+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
12951301
grep IS_64BIT_ARCH >/dev/null
12961302
then
12971303
case $UNAME_PROCESSOR in
@@ -1386,7 +1392,7 @@ EOF
13861392
echo i386-pc-xenix
13871393
exit ;;
13881394
i*86:skyos:*:*)
1389-
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1395+
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
13901396
exit ;;
13911397
i*86:rdos:*:*)
13921398
echo ${UNAME_MACHINE}-pc-rdos
@@ -1405,18 +1411,17 @@ esac
14051411
cat >&2 <<EOF
14061412
$0: unable to guess system type
14071413
1408-
This script, last modified $timestamp, has failed to recognize
1409-
the operating system you are using. It is advised that you
1410-
download the most up to date version of the config scripts from
1414+
This script (version $timestamp), has failed to recognize the
1415+
operating system you are using. If your script is old, overwrite
1416+
config.guess and config.sub with the latest versions from:
14111417
14121418
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
14131419
and
14141420
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
14151421
1416-
If the version you run ($0) is already up to date, please
1417-
send the following data and any information you think might be
1418-
pertinent to <[email protected]> in order to provide the needed
1419-
information to handle your system.
1422+
If $0 has already been updated, send the following data and any
1423+
information you think might be pertinent to [email protected] to
1424+
provide the necessary information to handle your system.
14201425
14211426
config.guess timestamp = $timestamp
14221427

depends/config.sub

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Configuration validation subroutine script.
33
# Copyright 1992-2016 Free Software Foundation, Inc.
44

5-
timestamp='2016-01-01'
5+
timestamp='2016-05-10'
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
@@ -1399,7 +1399,7 @@ case $os in
13991399
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
14001400
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
14011401
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1402-
| -onefs* | -tirtos*)
1402+
| -onefs* | -tirtos* | -phoenix*)
14031403
# Remember, each alternative MUST END IN *, to match a version number.
14041404
;;
14051405
-qnx*)
@@ -1531,6 +1531,8 @@ case $os in
15311531
;;
15321532
-nacl*)
15331533
;;
1534+
-ios)
1535+
;;
15341536
-none)
15351537
;;
15361538
*)

0 commit comments

Comments
 (0)