Skip to content

Commit 0127caf

Browse files
committed
Update config.guess and config.sub from
https://git.savannah.gnu.org/cgit/config.git. Backport of r1872203 from trunk resp. r1872204 from 1.7.x. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1872205 13f79535-47bb-0310-9956-ffa450edef68
1 parent c7b5d77 commit 0127caf

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

build/config.guess

Lines changed: 11 additions & 6 deletions
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-2019 Free Software Foundation, Inc.
3+
# Copyright 1992-2020 Free Software Foundation, Inc.
44

5-
timestamp='2019-06-10'
5+
timestamp='2020-01-01'
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
@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2019 Free Software Foundation, Inc.
53+
Copyright 1992-2020 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."
@@ -99,6 +99,8 @@ tmp=
9999
trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
100100

101101
set_cc_for_build() {
102+
# prevent multiple calls if $tmp is already set
103+
test "$tmp" && return 0
102104
: "${TMPDIR=/tmp}"
103105
# shellcheck disable=SC2039
104106
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -274,12 +276,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
274276
*:Sortix:*:*)
275277
echo "$UNAME_MACHINE"-unknown-sortix
276278
exit ;;
279+
*:Twizzler:*:*)
280+
echo "$UNAME_MACHINE"-unknown-twizzler
281+
exit ;;
277282
*:Redox:*:*)
278283
echo "$UNAME_MACHINE"-unknown-redox
279284
exit ;;
280285
mips:OSF1:*.*)
281-
echo mips-dec-osf1
282-
exit ;;
286+
echo mips-dec-osf1
287+
exit ;;
283288
alpha:OSF1:*:*)
284289
case $UNAME_RELEASE in
285290
*4.0)
@@ -921,7 +926,7 @@ EOF
921926
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
922927
exit ;;
923928
alpha:Linux:*:*)
924-
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
929+
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
925930
EV5) UNAME_MACHINE=alphaev5 ;;
926931
EV56) UNAME_MACHINE=alphaev56 ;;
927932
PCA56) UNAME_MACHINE=alphapca56 ;;

build/config.sub

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright 1992-2019 Free Software Foundation, Inc.
3+
# Copyright 1992-2020 Free Software Foundation, Inc.
44

5-
timestamp='2019-06-30'
5+
timestamp='2020-01-01'
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
@@ -67,7 +67,7 @@ Report bugs and patches to <[email protected]>."
6767
version="\
6868
GNU config.sub ($timestamp)
6969
70-
Copyright 1992-2019 Free Software Foundation, Inc.
70+
Copyright 1992-2020 Free Software Foundation, Inc.
7171
7272
This is free software; see the source for copying conditions. There is NO
7373
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1343,7 +1343,7 @@ case $os in
13431343
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
13441344
| sym* | kopensolaris* | plan9* \
13451345
| amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
1346-
| aos* | aros* | cloudabi* | sortix* \
1346+
| aos* | aros* | cloudabi* | sortix* | twizzler* \
13471347
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
13481348
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
13491349
| knetbsd* | mirbsd* | netbsd* \

0 commit comments

Comments
 (0)