Skip to content

Commit c0555dc

Browse files
fanquakelaanwj
authored andcommitted
depends: latest config.guess and config.sub
1 parent 89fc6b6 commit c0555dc

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

depends/config.guess

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

5-
timestamp='2015-01-01'
5+
timestamp='2015-03-04'
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
@@ -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
@@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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.//'`
@@ -933,6 +947,9 @@ EOF
933947
crisv32:Linux:*:*)
934948
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
935949
exit ;;
950+
e2k:Linux:*:*)
951+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
952+
exit ;;
936953
frv:Linux:*:*)
937954
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
938955
exit ;;

depends/config.sub

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

5-
timestamp='2015-01-01'
5+
timestamp='2015-03-08'
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
@@ -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
@@ -259,7 +259,7 @@ case $basic_machine in
259259
| bfin \
260260
| c4x | c8051 | clipper \
261261
| d10v | d30v | dlx | dsp16xx \
262-
| epiphany \
262+
| e2k | epiphany \
263263
| fido | fr30 | frv | ft32 \
264264
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265265
| hexagon \
@@ -381,7 +381,7 @@ case $basic_machine in
381381
| c[123]* | c30-* | [cjt]90-* | c4x-* \
382382
| c8051-* | clipper-* | craynv-* | cydra-* \
383383
| d10v-* | d30v-* | dlx-* \
384-
| elxsi-* \
384+
| e2k-* | elxsi-* \
385385
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
386386
| h8300-* | h8500-* \
387387
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -518,6 +518,9 @@ case $basic_machine in
518518
basic_machine=i386-pc
519519
os=-aros
520520
;;
521+
asmjs)
522+
basic_machine=asmjs-unknown
523+
;;
521524
aux)
522525
basic_machine=m68k-apple
523526
os=-aux
@@ -1373,7 +1376,7 @@ case $os in
13731376
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
13741377
| -sym* | -kopensolaris* | -plan9* \
13751378
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1376-
| -aos* | -aros* \
1379+
| -aos* | -aros* | -cloudabi* \
13771380
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13781381
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13791382
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \

0 commit comments

Comments
 (0)