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

Commit e324f8a

Browse files
peterepetere
committed
Update config.guess and config.sub
1 parent d136d60 commit e324f8a

File tree

2 files changed

+77
-59
lines changed

2 files changed

+77
-59
lines changed

‎config/config.guess

+65-49
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-2015 Free Software Foundation, Inc.
3+
# Copyright 1992-2016 Free Software Foundation, Inc.
44

5-
timestamp='2015-07-03'
5+
timestamp='2016-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
@@ -27,7 +27,7 @@ timestamp='2015-07-03'
2727
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
2828
#
2929
# You can get the latest version of this script from:
30-
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
30+
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
3131
#
3232
# Please send patches to <config-patches@gnu.org>.
3333

@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2015 Free Software Foundation, Inc.
53+
Copyright 1992-2016 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."
@@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
237237
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
238238
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
239239
exit ;;
240+
*:LibertyBSD:*:*)
241+
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
242+
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
243+
exit ;;
240244
*:ekkoBSD:*:*)
241245
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
242246
exit ;;
@@ -249,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
249253
*:MirBSD:*:*)
250254
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
251255
exit ;;
256+
*:Sortix:*:*)
257+
echo ${UNAME_MACHINE}-unknown-sortix
258+
exit ;;
252259
alpha:OSF1:*:*)
253260
case $UNAME_RELEASE in
254261
*4.0)
@@ -265,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
265272
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
266273
case "$ALPHA_CPU_TYPE" in
267274
"EV4 (21064)")
268-
UNAME_MACHINE="alpha" ;;
275+
UNAME_MACHINE=alpha ;;
269276
"EV4.5 (21064)")
270-
UNAME_MACHINE="alpha" ;;
277+
UNAME_MACHINE=alpha ;;
271278
"LCA4 (21066/21068)")
272-
UNAME_MACHINE="alpha" ;;
279+
UNAME_MACHINE=alpha ;;
273280
"EV5 (21164)")
274-
UNAME_MACHINE="alphaev5" ;;
281+
UNAME_MACHINE=alphaev5 ;;
275282
"EV5.6 (21164A)")
276-
UNAME_MACHINE="alphaev56" ;;
283+
UNAME_MACHINE=alphaev56 ;;
277284
"EV5.6 (21164PC)")
278-
UNAME_MACHINE="alphapca56" ;;
285+
UNAME_MACHINE=alphapca56 ;;
279286
"EV5.7 (21164PC)")
280-
UNAME_MACHINE="alphapca57" ;;
287+
UNAME_MACHINE=alphapca57 ;;
281288
"EV6 (21264)")
282-
UNAME_MACHINE="alphaev6" ;;
289+
UNAME_MACHINE=alphaev6 ;;
283290
"EV6.7 (21264A)")
284-
UNAME_MACHINE="alphaev67" ;;
291+
UNAME_MACHINE=alphaev67 ;;
285292
"EV6.8CB (21264C)")
286-
UNAME_MACHINE="alphaev68" ;;
293+
UNAME_MACHINE=alphaev68 ;;
287294
"EV6.8AL (21264B)")
288-
UNAME_MACHINE="alphaev68" ;;
295+
UNAME_MACHINE=alphaev68 ;;
289296
"EV6.8CX (21264D)")
290-
UNAME_MACHINE="alphaev68" ;;
297+
UNAME_MACHINE=alphaev68 ;;
291298
"EV6.9A (21264/EV69A)")
292-
UNAME_MACHINE="alphaev69" ;;
299+
UNAME_MACHINE=alphaev69 ;;
293300
"EV7 (21364)")
294-
UNAME_MACHINE="alphaev7" ;;
301+
UNAME_MACHINE=alphaev7 ;;
295302
"EV7.9 (21364A)")
296-
UNAME_MACHINE="alphaev79" ;;
303+
UNAME_MACHINE=alphaev79 ;;
297304
esac
298305
# A Pn.n version is a patched version.
299306
# A Vn.n version is a released version.
300307
# A Tn.n version is a released field test version.
301308
# A Xn.n version is an unreleased experimental baselevel.
302309
# 1.2 uses "1.2" for uname -r.
303-
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
310+
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
304311
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
305312
exitcode=$?
306313
trap '' 0
@@ -373,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
373380
exit ;;
374381
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
375382
eval $set_cc_for_build
376-
SUN_ARCH="i386"
383+
SUN_ARCH=i386
377384
# If there is a compiler, see if it is configured for 64-bit objects.
378385
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
379386
# This test works for both compilers.
380-
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
387+
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
381388
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
382-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
389+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
383390
grep IS_64BIT_ARCH >/dev/null
384391
then
385-
SUN_ARCH="x86_64"
392+
SUN_ARCH=x86_64
386393
fi
387394
fi
388395
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -407,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
407414
exit ;;
408415
sun*:*:4.2BSD:*)
409416
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
410-
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
417+
test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
411418
case "`/bin/arch`" in
412419
sun3)
413420
echo m68k-sun-sunos${UNAME_RELEASE}
@@ -632,13 +639,13 @@ EOF
632639
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
633640
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
634641
case "${sc_cpu_version}" in
635-
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
636-
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
642+
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
643+
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
637644
532) # CPU_PA_RISC2_0
638645
case "${sc_kernel_bits}" in
639-
32) HP_ARCH="hppa2.0n" ;;
640-
64) HP_ARCH="hppa2.0w" ;;
641-
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
646+
32) HP_ARCH=hppa2.0n ;;
647+
64) HP_ARCH=hppa2.0w ;;
648+
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
642649
esac ;;
643650
esac
644651
fi
@@ -677,11 +684,11 @@ EOF
677684
exit (0);
678685
}
679686
EOF
680-
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
687+
(CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
681688
test -z "$HP_ARCH" && HP_ARCH=hppa
682689
fi ;;
683690
esac
684-
if [ ${HP_ARCH} = "hppa2.0w" ]
691+
if [ ${HP_ARCH} = hppa2.0w ]
685692
then
686693
eval $set_cc_for_build
687694

@@ -694,12 +701,12 @@ EOF
694701
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
695702
# => hppa64-hp-hpux11.23
696703

697-
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
704+
if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
698705
grep -q __LP64__
699706
then
700-
HP_ARCH="hppa2.0w"
707+
HP_ARCH=hppa2.0w
701708
else
702-
HP_ARCH="hppa64"
709+
HP_ARCH=hppa64
703710
fi
704711
fi
705712
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -804,14 +811,14 @@ EOF
804811
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
805812
exit ;;
806813
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
807-
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
808-
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
814+
FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
815+
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
809816
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
810817
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
811818
exit ;;
812819
5000:UNIX_System_V:4.*:*)
813-
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
814-
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
820+
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
821+
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
815822
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
816823
exit ;;
817824
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -893,7 +900,7 @@ EOF
893900
exit ;;
894901
*:GNU/*:*:*)
895902
# other systems with GNU libc and userland
896-
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
903+
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
897904
exit ;;
898905
i*86:Minix:*:*)
899906
echo ${UNAME_MACHINE}-pc-minix
@@ -916,7 +923,7 @@ EOF
916923
EV68*) UNAME_MACHINE=alphaev68 ;;
917924
esac
918925
objdump --private-headers /bin/sh | grep -q ld.so.1
919-
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
926+
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
920927
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
921928
exit ;;
922929
arc:Linux:*:* | arceb:Linux:*:*)
@@ -962,6 +969,9 @@ EOF
962969
ia64:Linux:*:*)
963970
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
964971
exit ;;
972+
k1om:Linux:*:*)
973+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
974+
exit ;;
965975
m32r*:Linux:*:*)
966976
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
967977
exit ;;
@@ -1117,7 +1127,7 @@ EOF
11171127
# uname -m prints for DJGPP always 'pc', but it prints nothing about
11181128
# the processor, so we play safe by assuming i586.
11191129
# Note: whatever this is, it MUST be the same as what config.sub
1120-
# prints for the "djgpp" host, or else GDB configury will decide that
1130+
# prints for the "djgpp" host, or else GDB configure will decide that
11211131
# this is a cross-build.
11221132
echo i586-pc-msdosdjgpp
11231133
exit ;;
@@ -1266,6 +1276,9 @@ EOF
12661276
SX-8R:SUPER-UX:*:*)
12671277
echo sx8r-nec-superux${UNAME_RELEASE}
12681278
exit ;;
1279+
SX-ACE:SUPER-UX:*:*)
1280+
echo sxace-nec-superux${UNAME_RELEASE}
1281+
exit ;;
12691282
Power*:Rhapsody:*:*)
12701283
echo powerpc-apple-rhapsody${UNAME_RELEASE}
12711284
exit ;;
@@ -1279,9 +1292,9 @@ EOF
12791292
UNAME_PROCESSOR=powerpc
12801293
fi
12811294
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1282-
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1295+
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
12831296
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1284-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1297+
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
12851298
grep IS_64BIT_ARCH >/dev/null
12861299
then
12871300
case $UNAME_PROCESSOR in
@@ -1303,7 +1316,7 @@ EOF
13031316
exit ;;
13041317
*:procnto*:*:* | *:QNX:[0123456789]*:*)
13051318
UNAME_PROCESSOR=`uname -p`
1306-
if test "$UNAME_PROCESSOR" = "x86"; then
1319+
if test "$UNAME_PROCESSOR" = x86; then
13071320
UNAME_PROCESSOR=i386
13081321
UNAME_MACHINE=pc
13091322
fi
@@ -1334,7 +1347,7 @@ EOF
13341347
# "uname -m" is not consistent, so use $cputype instead. 386
13351348
# is converted to i386 for consistency with other x86
13361349
# operating systems.
1337-
if test "$cputype" = "386"; then
1350+
if test "$cputype" = 386; then
13381351
UNAME_MACHINE=i386
13391352
else
13401353
UNAME_MACHINE="$cputype"
@@ -1376,7 +1389,7 @@ EOF
13761389
echo i386-pc-xenix
13771390
exit ;;
13781391
i*86:skyos:*:*)
1379-
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1392+
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
13801393
exit ;;
13811394
i*86:rdos:*:*)
13821395
echo ${UNAME_MACHINE}-pc-rdos
@@ -1387,6 +1400,9 @@ EOF
13871400
x86_64:VMkernel:*:*)
13881401
echo ${UNAME_MACHINE}-unknown-esx
13891402
exit ;;
1403+
amd64:Isilon\ OneFS:*:*)
1404+
echo x86_64-unknown-onefs
1405+
exit ;;
13901406
esac
13911407

13921408
cat >&2 <<EOF
@@ -1396,9 +1412,9 @@ This script, last modified $timestamp, has failed to recognize
13961412
the operating system you are using. It is advised that you
13971413
download the most up to date version of the config scripts from
13981414
1399-
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1415+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
14001416
and
1401-
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1417+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
14021418
14031419
If the version you run ($0) is already up to date, please
14041420
send the following data and any information you think might be

‎config/config.sub

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright 1992-2015 Free Software Foundation, Inc.
3+
# Copyright 1992-2016 Free Software Foundation, Inc.
44

5-
timestamp='2015-08-18'
5+
timestamp='2016-03-30'
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
@@ -33,7 +33,7 @@ timestamp='2015-08-18'
3333
# Otherwise, we print the canonical config type on stdout and succeed.
3434

3535
# You can get the latest version of this script from:
36-
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
36+
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
3737

3838
# This file is supposed to be the same for all GNU packages
3939
# and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-08-18'
5353
me=`echo "$0" | sed -e 's,.*/,,'`
5454

5555
usage="\
56-
Usage: $0 [OPTION] CPU-MFR-OPSYS
57-
$0 [OPTION] ALIAS
56+
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
5857
5958
Canonicalize a configuration name.
6059
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
6867
version="\
6968
GNU config.sub ($timestamp)
7069
71-
Copyright 1992-2015 Free Software Foundation, Inc.
70+
Copyright 1992-2016 Free Software Foundation, Inc.
7271
7372
This is free software; see the source for copying conditions. There is NO
7473
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -521,7 +520,7 @@ case $basic_machine in
521520
basic_machine=i386-pc
522521
os=-aros
523522
;;
524-
asmjs)
523+
asmjs)
525524
basic_machine=asmjs-unknown
526525
;;
527526
aux)
@@ -1379,11 +1378,11 @@ case $os in
13791378
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
13801379
| -sym* | -kopensolaris* | -plan9* \
13811380
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1382-
| -aos* | -aros* | -cloudabi* \
1381+
| -aos* | -aros* | -cloudabi* | -sortix* \
13831382
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13841383
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13851384
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1386-
| -bitrig* | -openbsd* | -solidbsd* \
1385+
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
13871386
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
13881387
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
13891388
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1399,7 +1398,8 @@ case $os in
13991398
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
14001399
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
14011400
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1402-
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1401+
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1402+
| -onefs* | -tirtos*)
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)