Skip to content

Commit ae69a75

Browse files
committed
Merge pull request #6801
e76d9e4 [depends] Latest config.guess and config.sub (fanquake)
2 parents 87e5539 + e76d9e4 commit ae69a75

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

depends/config.guess

Lines changed: 10 additions & 4 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-03-04'
5+
timestamp='2015-09-14'
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
@@ -221,7 +221,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
221221
release='-gnu'
222222
;;
223223
*)
224-
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
224+
release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
225225
;;
226226
esac
227227
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -249,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
249249
*:MirBSD:*:*)
250250
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
251251
exit ;;
252+
*:Sortix:*:*)
253+
echo ${UNAME_MACHINE}-unknown-sortix
254+
exit ;;
252255
alpha:OSF1:*:*)
253256
case $UNAME_RELEASE in
254257
*4.0)
@@ -962,6 +965,9 @@ EOF
962965
ia64:Linux:*:*)
963966
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
964967
exit ;;
968+
k1om:Linux:*:*)
969+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
970+
exit ;;
965971
m32r*:Linux:*:*)
966972
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
967973
exit ;;
@@ -1038,7 +1044,7 @@ EOF
10381044
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
10391045
exit ;;
10401046
x86_64:Linux:*:*)
1041-
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1047+
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
10421048
exit ;;
10431049
xtensa*:Linux:*:*)
10441050
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1117,7 +1123,7 @@ EOF
11171123
# uname -m prints for DJGPP always 'pc', but it prints nothing about
11181124
# the processor, so we play safe by assuming i586.
11191125
# Note: whatever this is, it MUST be the same as what config.sub
1120-
# prints for the "djgpp" host, or else GDB configure will decide that
1126+
# prints for the "djgpp" host, or else GDB configury will decide that
11211127
# this is a cross-build.
11221128
echo i586-pc-msdosdjgpp
11231129
exit ;;

depends/config.sub

Lines changed: 7 additions & 4 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-03-08'
5+
timestamp='2015-08-20'
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
@@ -255,6 +255,7 @@ 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 \
@@ -305,7 +306,7 @@ case $basic_machine in
305306
| riscv32 | riscv64 \
306307
| rl78 | rx \
307308
| score \
308-
| 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 \
309310
| sh64 | sh64le \
310311
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
311312
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,6 +377,7 @@ case $basic_machine in
376377
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
377378
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
378379
| avr-* | avr32-* \
380+
| ba-* \
379381
| be32-* | be64-* \
380382
| bfin-* | bs2000-* \
381383
| c[123]* | c30-* | [cjt]90-* | c4x-* \
@@ -428,12 +430,13 @@ case $basic_machine in
428430
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
429431
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
430432
| pyramid-* \
433+
| riscv32-* | riscv64-* \
431434
| rl78-* | romp-* | rs6000-* | rx-* \
432435
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
433436
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
434437
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
435438
| sparclite-* \
436-
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
439+
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
437440
| tahoe-* \
438441
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
439442
| tile*-* \
@@ -1376,7 +1379,7 @@ case $os in
13761379
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
13771380
| -sym* | -kopensolaris* | -plan9* \
13781381
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1379-
| -aos* | -aros* | -cloudabi* \
1382+
| -aos* | -aros* | -cloudabi* | -sortix* \
13801383
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13811384
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13821385
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \

0 commit comments

Comments
 (0)