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

Commit cf09230

Browse files
peterepetere
committed
Update config.guess and config.sub
1 parent 3420b24 commit cf09230

File tree

2 files changed

+76
-44
lines changed

2 files changed

+76
-44
lines changed

‎config/config.guess

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Attempt to guess a canonical system name.
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
44
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011 Free Software Foundation, Inc.
5+
# 2011, 2012 Free Software Foundation, Inc.
66

7-
timestamp='2011-05-11'
7+
timestamp='2012-02-10'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
1717
# General Public License for more details.
1818
#
1919
# You should have received a copy of the GNU General Public License
20-
# along with this program; if not, write to the Free Software
21-
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22-
# 02110-1301, USA.
20+
# along with this program; if not, see <http://www.gnu.org/licenses/>.
2321
#
2422
# As a special exception to the GNU General Public License, if you
2523
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
5755
5856
Originally written by Per Bothner.
5957
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
60-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
61-
Software Foundation, Inc.
58+
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59+
Free Software Foundation, Inc.
6260
6361
This is free software; see the source for copying conditions. There is NO
6462
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
145143
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
146144
*:NetBSD:*:*)
147145
# NetBSD (nbsd) targets should (where applicable) match one or
148-
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
146+
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
149147
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
150148
# switched to ELF, *-*-netbsd* would select the old
151149
# object file format. This provides both forward
@@ -792,13 +790,12 @@ EOF
792790
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
793791
exit ;;
794792
*:FreeBSD:*:*)
795-
case ${UNAME_MACHINE} in
796-
pc98)
797-
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793+
UNAME_PROCESSOR=`/usr/bin/uname -p`
794+
case ${UNAME_PROCESSOR} in
798795
amd64)
799796
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
800797
*)
801-
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798+
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
802799
esac
803800
exit ;;
804801
i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
807804
*:MINGW*:*)
808805
echo ${UNAME_MACHINE}-pc-mingw32
809806
exit ;;
807+
i*:MSYS*:*)
808+
echo ${UNAME_MACHINE}-pc-msys
809+
exit ;;
810810
i*:windows32*:*)
811811
# uname -m includes "-pc" on this system.
812812
echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
861861
i*86:Minix:*:*)
862862
echo ${UNAME_MACHINE}-pc-minix
863863
exit ;;
864+
aarch64:Linux:*:*)
865+
echo ${UNAME_MACHINE}-unknown-linux-gnu
866+
exit ;;
867+
aarch64_be:Linux:*:*)
868+
UNAME_MACHINE=aarch64_be
869+
echo ${UNAME_MACHINE}-unknown-linux-gnu
870+
exit ;;
864871
alpha:Linux:*:*)
865872
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
866873
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
895902
echo ${UNAME_MACHINE}-unknown-linux-gnu
896903
exit ;;
897904
cris:Linux:*:*)
898-
echo cris-axis-linux-gnu
905+
echo ${UNAME_MACHINE}-axis-linux-gnu
899906
exit ;;
900907
crisv32:Linux:*:*)
901-
echo crisv32-axis-linux-gnu
908+
echo ${UNAME_MACHINE}-axis-linux-gnu
902909
exit ;;
903910
frv:Linux:*:*)
904-
echo frv-unknown-linux-gnu
911+
echo ${UNAME_MACHINE}-unknown-linux-gnu
912+
exit ;;
913+
hexagon:Linux:*:*)
914+
echo ${UNAME_MACHINE}-unknown-linux-gnu
905915
exit ;;
906916
i*86:Linux:*:*)
907917
LIBC=gnu
@@ -943,7 +953,7 @@ EOF
943953
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
944954
;;
945955
or32:Linux:*:*)
946-
echo or32-unknown-linux-gnu
956+
echo ${UNAME_MACHINE}-unknown-linux-gnu
947957
exit ;;
948958
padre:Linux:*:*)
949959
echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
978988
echo ${UNAME_MACHINE}-unknown-linux-gnu
979989
exit ;;
980990
tile*:Linux:*:*)
981-
echo ${UNAME_MACHINE}-tilera-linux-gnu
991+
echo ${UNAME_MACHINE}-unknown-linux-gnu
982992
exit ;;
983993
vax:Linux:*:*)
984994
echo ${UNAME_MACHINE}-dec-linux-gnu
985995
exit ;;
986996
x86_64:Linux:*:*)
987-
echo x86_64-unknown-linux-gnu
997+
echo ${UNAME_MACHINE}-unknown-linux-gnu
988998
exit ;;
989999
xtensa*:Linux:*:*)
9901000
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
13151325
i*86:AROS:*:*)
13161326
echo ${UNAME_MACHINE}-pc-aros
13171327
exit ;;
1328+
x86_64:VMkernel:*:*)
1329+
echo ${UNAME_MACHINE}-unknown-esx
1330+
exit ;;
13181331
esac
13191332

13201333
#echo '(No uname command or uname output not recognized.)' 1>&2

‎config/config.sub

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Configuration validation subroutine script.
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
44
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011 Free Software Foundation, Inc.
5+
# 2011, 2012 Free Software Foundation, Inc.
66

7-
timestamp='2011-03-23'
7+
timestamp='2012-04-18'
88

99
# This file is (in principle) common to ALL GNU software.
1010
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
2121
# GNU General Public License for more details.
2222
#
2323
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26-
# 02110-1301, USA.
24+
# along with this program; if not, see <http://www.gnu.org/licenses/>.
2725
#
2826
# As a special exception to the GNU General Public License, if you
2927
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
7674
GNU config.sub ($timestamp)
7775
7876
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
79-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
80-
Software Foundation, Inc.
77+
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78+
Free Software Foundation, Inc.
8179
8280
This is free software; see the source for copying conditions. There is NO
8381
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
132130
os=-$maybe_os
133131
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
134132
;;
133+
android-linux)
134+
os=-linux-android
135+
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136+
;;
135137
*)
136138
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
137139
if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@ case $os in
223225
-isc*)
224226
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
225227
;;
228+
-lynx*178)
229+
os=-lynxos178
230+
;;
231+
-lynx*5)
232+
os=-lynxos5
233+
;;
226234
-lynx*)
227235
os=-lynxos
228236
;;
@@ -247,17 +255,22 @@ case $basic_machine in
247255
# Some are omitted here because they have special meanings below.
248256
1750a | 580 \
249257
| a29k \
258+
| aarch64 | aarch64_be \
250259
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
251260
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
252261
| am33_2.0 \
253262
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
263+
| be32 | be64 \
254264
| bfin \
255265
| c4x | clipper \
256266
| d10v | d30v | dlx | dsp16xx \
267+
| epiphany \
257268
| fido | fr30 | frv \
258269
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
270+
| hexagon \
259271
| i370 | i860 | i960 | ia64 \
260272
| ip2k | iq2000 \
273+
| le32 | le64 \
261274
| lm32 \
262275
| m32c | m32r | m32rle | m68000 | m68k | m88k \
263276
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@ case $basic_machine in
291304
| pdp10 | pdp11 | pj | pjl \
292305
| powerpc | powerpc64 | powerpc64le | powerpcle \
293306
| pyramid \
294-
| rx \
307+
| rl78 | rx \
295308
| score \
296309
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
297310
| sh64 | sh64le \
@@ -300,7 +313,7 @@ case $basic_machine in
300313
| spu \
301314
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
302315
| ubicom32 \
303-
| v850 | v850e \
316+
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
304317
| we32k \
305318
| x86 | xc16x | xstormy16 | xtensa \
306319
| z8k | z80)
@@ -315,8 +328,7 @@ case $basic_machine in
315328
c6x)
316329
basic_machine=tic6x-unknown
317330
;;
318-
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
319-
# Motorola 68HC11/12.
331+
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
320332
basic_machine=$basic_machine-unknown
321333
os=-none
322334
;;
@@ -329,7 +341,10 @@ case $basic_machine in
329341
strongarm | thumb | xscale)
330342
basic_machine=arm-unknown
331343
;;
332-
344+
xgate)
345+
basic_machine=$basic_machine-unknown
346+
os=-none
347+
;;
333348
xscaleeb)
334349
basic_machine=armeb-unknown
335350
;;
@@ -352,11 +367,13 @@ case $basic_machine in
352367
# Recognize the basic CPU types with company name.
353368
580-* \
354369
| a29k-* \
370+
| aarch64-* | aarch64_be-* \
355371
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
356372
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
357373
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
358374
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
359375
| avr-* | avr32-* \
376+
| be32-* | be64-* \
360377
| bfin-* | bs2000-* \
361378
| c[123]* | c30-* | [cjt]90-* | c4x-* \
362379
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +382,10 @@ case $basic_machine in
365382
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
366383
| h8300-* | h8500-* \
367384
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
385+
| hexagon-* \
368386
| i*86-* | i860-* | i960-* | ia64-* \
369387
| ip2k-* | iq2000-* \
388+
| le32-* | le64-* \
370389
| lm32-* \
371390
| m32c-* | m32r-* | m32rle-* \
372391
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,18 +419,19 @@ case $basic_machine in
400419
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
401420
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
402421
| pyramid-* \
403-
| romp-* | rs6000-* | rx-* \
422+
| rl78-* | romp-* | rs6000-* | rx-* \
404423
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
405424
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
406425
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
407426
| sparclite-* \
408427
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
409428
| tahoe-* \
410429
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
411-
| tile-* | tilegx-* \
430+
| tile*-* \
412431
| tron-* \
413432
| ubicom32-* \
414-
| v850-* | v850e-* | vax-* \
433+
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
434+
| vax-* \
415435
| we32k-* \
416436
| x86-* | x86_64-* | xc16x-* | xps100-* \
417437
| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@ case $basic_machine in
711731
i370-ibm* | ibm*)
712732
basic_machine=i370-ibm
713733
;;
714-
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
715734
i*86v32)
716735
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
717736
os=-sysv32
@@ -808,10 +827,18 @@ case $basic_machine in
808827
ms1-*)
809828
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
810829
;;
830+
msys)
831+
basic_machine=i386-pc
832+
os=-msys
833+
;;
811834
mvs)
812835
basic_machine=i370-ibm
813836
os=-mvs
814837
;;
838+
nacl)
839+
basic_machine=le32-unknown
840+
os=-nacl
841+
;;
815842
ncr3000)
816843
basic_machine=i486-ncr
817844
os=-sysv4
@@ -1120,13 +1147,8 @@ case $basic_machine in
11201147
basic_machine=t90-cray
11211148
os=-unicos
11221149
;;
1123-
# This must be matched before tile*.
1124-
tilegx*)
1125-
basic_machine=tilegx-unknown
1126-
os=-linux-gnu
1127-
;;
11281150
tile*)
1129-
basic_machine=tile-unknown
1151+
basic_machine=$basic_machine-unknown
11301152
os=-linux-gnu
11311153
;;
11321154
tx39)
@@ -1336,7 +1358,7 @@ case $os in
13361358
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
13371359
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
13381360
| -chorusos* | -chorusrdb* | -cegcc* \
1339-
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1361+
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
13401362
| -mingw32* | -linux-gnu* | -linux-android* \
13411363
| -linux-newlib* | -linux-uclibc* \
13421364
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1570,6 @@ case $basic_machine in
15481570
;;
15491571
m68000-sun)
15501572
os=-sunos3
1551-
# This also exists in the configure program, but was not the
1552-
# default.
1553-
# os=-sunos4
15541573
;;
15551574
m68*-cisco)
15561575
os=-aout

0 commit comments

Comments
 (0)