🌐 AI搜索 & 代理 主页
Skip to content

Commit b53b603

Browse files
peterepetere
committed
Update config.guess and config.sub
1 parent 41a2760 commit b53b603

File tree

2 files changed

+86
-63
lines changed

2 files changed

+86
-63
lines changed

‎config/config.guess‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011, 2012 Free Software Foundation, Inc.
3+
# Copyright 1992-2013 Free Software Foundation, Inc.
64

7-
timestamp='2012-02-10'
5+
timestamp='2013-04-24'
86

97
# This file is free software; you can redistribute it and/or modify it
108
# under the terms of the GNU General Public License as published by
11-
# the Free Software Foundation; either version 2 of the License, or
9+
# the Free Software Foundation; either version 3 of the License, or
1210
# (at your option) any later version.
1311
#
1412
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
2220
# As a special exception to the GNU General Public License, if you
2321
# distribute this file as part of a program that contains a
2422
# configuration script generated by Autoconf, you may include it under
25-
# the same distribution terms that you use for the rest of that program.
26-
27-
28-
# Originally written by Per Bothner. Please send patches (context
29-
# diff format) to <config-patches@gnu.org> and include a ChangeLog
30-
# entry.
23+
# the same distribution terms that you use for the rest of that
24+
# program. This Exception is an additional permission under section 7
25+
# of the GNU General Public License, version 3 ("GPLv3").
3126
#
32-
# This script attempts to guess a canonical system name similar to
33-
# config.sub. If it succeeds, it prints the system name on stdout, and
34-
# exits with 0. Otherwise, it exits with 1.
27+
# Originally written by Per Bothner.
3528
#
3629
# You can get the latest version of this script from:
3730
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
31+
#
32+
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
33+
3834

3935
me=`echo "$0" | sed -e 's,.*/,,'`
4036

@@ -54,9 +50,7 @@ version="\
5450
GNU config.guess ($timestamp)
5551
5652
Originally written by Per Bothner.
57-
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
58-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59-
Free Software Foundation, Inc.
53+
Copyright 1992-2013 Free Software Foundation, Inc.
6054
6155
This is free software; see the source for copying conditions. There is NO
6256
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -200,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
200194
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
201195
echo "${machine}-${os}${release}"
202196
exit ;;
197+
*:Bitrig:*:*)
198+
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
199+
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
200+
exit ;;
203201
*:OpenBSD:*:*)
204202
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
205203
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +300,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
302300
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
303301
echo arm-acorn-riscix${UNAME_RELEASE}
304302
exit ;;
305-
arm:riscos:*:*|arm:RISCOS:*:*)
303+
arm*:riscos:*:*|arm*:RISCOS:*:*)
306304
echo arm-unknown-riscos
307305
exit ;;
308306
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +799,9 @@ EOF
801799
i*:CYGWIN*:*)
802800
echo ${UNAME_MACHINE}-pc-cygwin
803801
exit ;;
802+
*:MINGW64*:*)
803+
echo ${UNAME_MACHINE}-pc-mingw64
804+
exit ;;
804805
*:MINGW*:*)
805806
echo ${UNAME_MACHINE}-pc-mingw32
806807
exit ;;
@@ -882,6 +883,9 @@ EOF
882883
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
883884
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
884885
exit ;;
886+
arc:Linux:*:* | arceb:Linux:*:*)
887+
echo ${UNAME_MACHINE}-unknown-linux-gnu
888+
exit ;;
885889
arm*:Linux:*:*)
886890
eval $set_cc_for_build
887891
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -920,6 +924,11 @@ EOF
920924
#ifdef __dietlibc__
921925
LIBC=dietlibc
922926
#endif
927+
#else
928+
#include <features.h>
929+
#ifdef __UCLIBC__
930+
LIBC=uclibc
931+
#endif
923932
EOF
924933
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
925934
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
@@ -952,6 +961,9 @@ EOF
952961
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
953962
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
954963
;;
964+
or1k:Linux:*:*)
965+
echo ${UNAME_MACHINE}-unknown-linux-gnu
966+
exit ;;
955967
or32:Linux:*:*)
956968
echo ${UNAME_MACHINE}-unknown-linux-gnu
957969
exit ;;
@@ -994,7 +1006,9 @@ EOF
9941006
echo ${UNAME_MACHINE}-dec-linux-gnu
9951007
exit ;;
9961008
x86_64:Linux:*:*)
997-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1009+
LIBC=gnu
1010+
test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc
1011+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9981012
exit ;;
9991013
xtensa*:Linux:*:*)
10001014
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1201,6 +1215,9 @@ EOF
12011215
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
12021216
echo i586-pc-haiku
12031217
exit ;;
1218+
x86_64:Haiku:*:*)
1219+
echo x86_64-unknown-haiku
1220+
exit ;;
12041221
SX-4:SUPER-UX:*:*)
12051222
echo sx4-nec-superux${UNAME_RELEASE}
12061223
exit ;;
@@ -1256,7 +1273,7 @@ EOF
12561273
NEO-?:NONSTOP_KERNEL:*:*)
12571274
echo neo-tandem-nsk${UNAME_RELEASE}
12581275
exit ;;
1259-
NSE-?:NONSTOP_KERNEL:*:*)
1276+
NSE-*:NONSTOP_KERNEL:*:*)
12601277
echo nse-tandem-nsk${UNAME_RELEASE}
12611278
exit ;;
12621279
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1347,6 @@ EOF
13301347
exit ;;
13311348
esac
13321349

1333-
#echo '(No uname command or uname output not recognized.)' 1>&2
1334-
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1335-
13361350
eval $set_cc_for_build
13371351
cat >$dummy.c <<EOF
13381352
#ifdef _SEQUENT_

‎config/config.sub‎

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011, 2012 Free Software Foundation, Inc.
3+
# Copyright 1992-2013 Free Software Foundation, Inc.
64

7-
timestamp='2012-04-18'
5+
timestamp='2013-04-24'
86

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
11-
# can handle that machine. It does not imply ALL GNU software can.
12-
#
13-
# This file is free software; you can redistribute it and/or modify
14-
# it under the terms of the GNU General Public License as published by
15-
# the Free Software Foundation; either version 2 of the License, or
7+
# This file is free software; you can redistribute it and/or modify it
8+
# under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation; either version 3 of the License, or
1610
# (at your option) any later version.
1711
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
12+
# This program is distributed in the hope that it will be useful, but
13+
# WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
# General Public License for more details.
2216
#
2317
# You should have received a copy of the GNU General Public License
2418
# along with this program; if not, see <http://www.gnu.org/licenses/>.
2519
#
2620
# As a special exception to the GNU General Public License, if you
2721
# distribute this file as part of a program that contains a
2822
# configuration script generated by Autoconf, you may include it under
29-
# the same distribution terms that you use for the rest of that program.
23+
# the same distribution terms that you use for the rest of that
24+
# program. This Exception is an additional permission under section 7
25+
# of the GNU General Public License, version 3 ("GPLv3").
3026

3127

32-
# Please send patches to <config-patches@gnu.org>. Submit a context
33-
# diff and a properly formatted GNU ChangeLog entry.
28+
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
3429
#
3530
# Configuration subroutine to validate and canonicalize a configuration type.
3631
# Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
7368
version="\
7469
GNU config.sub ($timestamp)
7570
76-
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78-
Free Software Foundation, Inc.
71+
Copyright 1992-2013 Free Software Foundation, Inc.
7972
8073
This is free software; see the source for copying conditions. There is NO
8174
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
123116
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
124117
case $maybe_os in
125118
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
126-
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
119+
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
127120
knetbsd*-gnu* | netbsd*-gnu* | \
128121
kopensolaris*-gnu* | \
129122
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
156149
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
157150
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
158151
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
159-
-apple | -axis | -knuth | -cray | -microblaze)
152+
-apple | -axis | -knuth | -cray | -microblaze*)
160153
os=
161154
basic_machine=$1
162155
;;
@@ -259,8 +252,10 @@ case $basic_machine in
259252
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
260253
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
261254
| am33_2.0 \
262-
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
263-
| be32 | be64 \
255+
| arc | arceb \
256+
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257+
| avr | avr32 \
258+
| be32 | be64 \
264259
| bfin \
265260
| c4x | clipper \
266261
| d10v | d30v | dlx | dsp16xx \
@@ -273,7 +268,7 @@ case $basic_machine in
273268
| le32 | le64 \
274269
| lm32 \
275270
| m32c | m32r | m32rle | m68000 | m68k | m88k \
276-
| maxq | mb | microblaze | mcore | mep | metag \
271+
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
277272
| mips | mipsbe | mipseb | mipsel | mipsle \
278273
| mips16 \
279274
| mips64 | mips64el \
@@ -291,16 +286,17 @@ case $basic_machine in
291286
| mipsisa64r2 | mipsisa64r2el \
292287
| mipsisa64sb1 | mipsisa64sb1el \
293288
| mipsisa64sr71k | mipsisa64sr71kel \
289+
| mipsr5900 | mipsr5900el \
294290
| mipstx39 | mipstx39el \
295291
| mn10200 | mn10300 \
296292
| moxie \
297293
| mt \
298294
| msp430 \
299295
| nds32 | nds32le | nds32be \
300-
| nios | nios2 \
296+
| nios | nios2 | nios2eb | nios2el \
301297
| ns16k | ns32k \
302298
| open8 \
303-
| or32 \
299+
| or1k | or32 \
304300
| pdp10 | pdp11 | pj | pjl \
305301
| powerpc | powerpc64 | powerpc64le | powerpcle \
306302
| pyramid \
@@ -370,7 +366,7 @@ case $basic_machine in
370366
| aarch64-* | aarch64_be-* \
371367
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
372368
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
373-
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
369+
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
374370
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
375371
| avr-* | avr32-* \
376372
| be32-* | be64-* \
@@ -389,7 +385,8 @@ case $basic_machine in
389385
| lm32-* \
390386
| m32c-* | m32r-* | m32rle-* \
391387
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
392-
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
388+
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
389+
| microblaze-* | microblazeel-* \
393390
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
394391
| mips16-* \
395392
| mips64-* | mips64el-* \
@@ -407,12 +404,13 @@ case $basic_machine in
407404
| mipsisa64r2-* | mipsisa64r2el-* \
408405
| mipsisa64sb1-* | mipsisa64sb1el-* \
409406
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407+
| mipsr5900-* | mipsr5900el-* \
410408
| mipstx39-* | mipstx39el-* \
411409
| mmix-* \
412410
| mt-* \
413411
| msp430-* \
414412
| nds32-* | nds32le-* | nds32be-* \
415-
| nios-* | nios2-* \
413+
| nios-* | nios2-* | nios2eb-* | nios2el-* \
416414
| none-* | np1-* | ns16k-* | ns32k-* \
417415
| open8-* \
418416
| orion-* \
@@ -788,9 +786,13 @@ case $basic_machine in
788786
basic_machine=ns32k-utek
789787
os=-sysv
790788
;;
791-
microblaze)
789+
microblaze*)
792790
basic_machine=microblaze-xilinx
793791
;;
792+
mingw64)
793+
basic_machine=x86_64-pc
794+
os=-mingw64
795+
;;
794796
mingw32)
795797
basic_machine=i386-pc
796798
os=-mingw32
@@ -1019,7 +1021,11 @@ case $basic_machine in
10191021
basic_machine=i586-unknown
10201022
os=-pw32
10211023
;;
1022-
rdos)
1024+
rdos | rdos64)
1025+
basic_machine=x86_64-pc
1026+
os=-rdos
1027+
;;
1028+
rdos32)
10231029
basic_machine=i386-pc
10241030
os=-rdos
10251031
;;
@@ -1346,21 +1352,21 @@ case $os in
13461352
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
13471353
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
13481354
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1349-
| -sym* | -kopensolaris* \
1355+
| -sym* | -kopensolaris* | -plan9* \
13501356
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
13511357
| -aos* | -aros* \
13521358
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13531359
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13541360
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1355-
| -openbsd* | -solidbsd* \
1361+
| -bitrig* | -openbsd* | -solidbsd* \
13561362
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
13571363
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
13581364
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
13591365
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
13601366
| -chorusos* | -chorusrdb* | -cegcc* \
13611367
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1362-
| -mingw32* | -linux-gnu* | -linux-android* \
1363-
| -linux-newlib* | -linux-uclibc* \
1368+
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369+
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
13641370
| -uxpv* | -beos* | -mpeix* | -udk* \
13651371
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
13661372
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1492,9 +1498,6 @@ case $os in
14921498
-aros*)
14931499
os=-aros
14941500
;;
1495-
-kaos*)
1496-
os=-kaos
1497-
;;
14981501
-zvmoe)
14991502
os=-zvmoe
15001503
;;
@@ -1543,6 +1546,9 @@ case $basic_machine in
15431546
c4x-* | tic4x-*)
15441547
os=-coff
15451548
;;
1549+
hexagon-*)
1550+
os=-elf
1551+
;;
15461552
tic54x-*)
15471553
os=-coff
15481554
;;
@@ -1583,6 +1589,9 @@ case $basic_machine in
15831589
mips*-*)
15841590
os=-elf
15851591
;;
1592+
or1k-*)
1593+
os=-elf
1594+
;;
15861595
or32-*)
15871596
os=-coff
15881597
;;

0 commit comments

Comments
 (0)