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

Commit 960ea97

Browse files
committed
Update config.guess and config.sub
1 parent 1cac8c9 commit 960ea97

File tree

2 files changed

+62
-25
lines changed

2 files changed

+62
-25
lines changed

config/config.guess

+31-13
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-2014 Free Software Foundation, Inc.
3+
# Copyright 1992-2015 Free Software Foundation, Inc.
44

5-
timestamp='2014-03-23'
5+
timestamp='2015-07-03'
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
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
2424
# program. This Exception is an additional permission under section 7
2525
# of the GNU General Public License, version 3 ("GPLv3").
2626
#
27-
# Originally written by Per Bothner.
27+
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
2828
#
2929
# You can get the latest version of this script from:
3030
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
3131
#
32-
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
32+
# Please send patches to <config-patches@gnu.org>.
3333

3434

3535
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2014 Free Software Foundation, Inc.
53+
Copyright 1992-2015 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."
@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168168
# Note: NetBSD doesn't particularly care about the vendor
169169
# portion of the name. We always set it to "unknown".
170170
sysctl="sysctl -n hw.machine_arch"
171-
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
172-
/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
171+
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
172+
/sbin/$sysctl 2>/dev/null || \
173+
/usr/sbin/$sysctl 2>/dev/null || \
174+
echo unknown)`
173175
case "${UNAME_MACHINE_ARCH}" in
174176
armeb) machine=armeb-unknown ;;
175177
arm*) machine=arm-unknown ;;
176178
sh3el) machine=shl-unknown ;;
177179
sh3eb) machine=sh-unknown ;;
178180
sh5el) machine=sh5le-unknown ;;
181+
earmv*)
182+
arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183+
endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
184+
machine=${arch}${endian}-unknown
185+
;;
179186
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
180187
esac
181188
# The Operating System including object format, if it has switched
182189
# to ELF recently, or will in the future.
183190
case "${UNAME_MACHINE_ARCH}" in
184-
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
191+
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
185192
eval $set_cc_for_build
186193
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
187194
| grep -q __ELF__
@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
197204
os=netbsd
198205
;;
199206
esac
207+
# Determine ABI tags.
208+
case "${UNAME_MACHINE_ARCH}" in
209+
earm*)
210+
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
211+
abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
212+
;;
213+
esac
200214
# The OS release
201215
# Debian GNU/NetBSD machines have a different userland, and
202216
# thus, need a distinct triplet. However, they do not need
@@ -207,13 +221,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
207221
release='-gnu'
208222
;;
209223
*)
210-
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
224+
release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
211225
;;
212226
esac
213227
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
214228
# contains redundant information, the shorter form:
215229
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
216-
echo "${machine}-${os}${release}"
230+
echo "${machine}-${os}${release}${abi}"
217231
exit ;;
218232
*:Bitrig:*:*)
219233
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -579,8 +593,9 @@ EOF
579593
else
580594
IBM_ARCH=powerpc
581595
fi
582-
if [ -x /usr/bin/oslevel ] ; then
583-
IBM_REV=`/usr/bin/oslevel`
596+
if [ -x /usr/bin/lslpp ] ; then
597+
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
598+
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
584599
else
585600
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
586601
fi
@@ -932,6 +947,9 @@ EOF
932947
crisv32:Linux:*:*)
933948
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
934949
exit ;;
950+
e2k:Linux:*:*)
951+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
952+
exit ;;
935953
frv:Linux:*:*)
936954
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
937955
exit ;;
@@ -1020,7 +1038,7 @@ EOF
10201038
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
10211039
exit ;;
10221040
x86_64:Linux:*:*)
1023-
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1041+
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
10241042
exit ;;
10251043
xtensa*:Linux:*:*)
10261044
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

config/config.sub

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

5-
timestamp='2014-05-01'
5+
timestamp='2015-08-18'
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
@@ -25,7 +25,7 @@ timestamp='2014-05-01'
2525
# of the GNU General Public License, version 3 ("GPLv3").
2626

2727

28-
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
28+
# Please send patches to <config-patches@gnu.org>.
2929
#
3030
# Configuration subroutine to validate and canonicalize a configuration type.
3131
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
6868
version="\
6969
GNU config.sub ($timestamp)
7070
71-
Copyright 1992-2014 Free Software Foundation, Inc.
71+
Copyright 1992-2015 Free Software Foundation, Inc.
7272
7373
This is free software; see the source for copying conditions. There is NO
7474
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
117117
case $maybe_os in
118118
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119119
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120-
knetbsd*-gnu* | netbsd*-gnu* | \
120+
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
121121
kopensolaris*-gnu* | \
122122
storm-chaos* | os2-emx* | rtmk-nova*)
123123
os=-$maybe_os
@@ -255,12 +255,13 @@ case $basic_machine in
255255
| arc | arceb \
256256
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257257
| avr | avr32 \
258+
| ba \
258259
| be32 | be64 \
259260
| bfin \
260261
| c4x | c8051 | clipper \
261262
| d10v | d30v | dlx | dsp16xx \
262-
| epiphany \
263-
| fido | fr30 | frv \
263+
| e2k | epiphany \
264+
| fido | fr30 | frv | ft32 \
264265
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265266
| hexagon \
266267
| i370 | i860 | i960 | ia64 \
@@ -302,16 +303,18 @@ case $basic_machine in
302303
| pdp10 | pdp11 | pj | pjl \
303304
| powerpc | powerpc64 | powerpc64le | powerpcle \
304305
| pyramid \
306+
| riscv32 | riscv64 \
305307
| rl78 | rx \
306308
| score \
307-
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
309+
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
308310
| sh64 | sh64le \
309311
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
310312
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
311313
| spu \
312314
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
313315
| ubicom32 \
314316
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
317+
| visium \
315318
| we32k \
316319
| x86 | xc16x | xstormy16 | xtensa \
317320
| z8k | z80)
@@ -326,6 +329,9 @@ case $basic_machine in
326329
c6x)
327330
basic_machine=tic6x-unknown
328331
;;
332+
leon|leon[3-9])
333+
basic_machine=sparc-$basic_machine
334+
;;
329335
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
330336
basic_machine=$basic_machine-unknown
331337
os=-none
@@ -371,12 +377,13 @@ case $basic_machine in
371377
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
372378
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
373379
| avr-* | avr32-* \
380+
| ba-* \
374381
| be32-* | be64-* \
375382
| bfin-* | bs2000-* \
376383
| c[123]* | c30-* | [cjt]90-* | c4x-* \
377384
| c8051-* | clipper-* | craynv-* | cydra-* \
378385
| d10v-* | d30v-* | dlx-* \
379-
| elxsi-* \
386+
| e2k-* | elxsi-* \
380387
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
381388
| h8300-* | h8500-* \
382389
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -423,19 +430,21 @@ case $basic_machine in
423430
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
424431
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
425432
| pyramid-* \
433+
| riscv32-* | riscv64-* \
426434
| rl78-* | romp-* | rs6000-* | rx-* \
427435
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
428436
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
429437
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
430438
| sparclite-* \
431-
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
439+
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
432440
| tahoe-* \
433441
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
434442
| tile*-* \
435443
| tron-* \
436444
| ubicom32-* \
437445
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
438446
| vax-* \
447+
| visium-* \
439448
| we32k-* \
440449
| x86-* | x86_64-* | xc16x-* | xps100-* \
441450
| xstormy16-* | xtensa*-* \
@@ -512,6 +521,9 @@ case $basic_machine in
512521
basic_machine=i386-pc
513522
os=-aros
514523
;;
524+
asmjs)
525+
basic_machine=asmjs-unknown
526+
;;
515527
aux)
516528
basic_machine=m68k-apple
517529
os=-aux
@@ -773,6 +785,9 @@ case $basic_machine in
773785
basic_machine=m68k-isi
774786
os=-sysv
775787
;;
788+
leon-*|leon[3-9]-*)
789+
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
790+
;;
776791
m68knommu)
777792
basic_machine=m68k-unknown
778793
os=-linux
@@ -828,6 +843,10 @@ case $basic_machine in
828843
basic_machine=powerpc-unknown
829844
os=-morphos
830845
;;
846+
moxiebox)
847+
basic_machine=moxie-unknown
848+
os=-moxiebox
849+
;;
831850
msdos)
832851
basic_machine=i386-pc
833852
os=-msdos
@@ -1360,7 +1379,7 @@ case $os in
13601379
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
13611380
| -sym* | -kopensolaris* | -plan9* \
13621381
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1363-
| -aos* | -aros* \
1382+
| -aos* | -aros* | -cloudabi* \
13641383
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13651384
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13661385
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1373,7 +1392,7 @@ case $os in
13731392
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
13741393
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
13751394
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
1376-
| -uxpv* | -beos* | -mpeix* | -udk* \
1395+
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
13771396
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
13781397
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
13791398
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

0 commit comments

Comments
 (0)