Skip to content

Commit 260bb41

Browse files
fxlbguyharris
authored andcommitted
Autoconf: Update config.{guess,sub}, timestamps 2024-01-01
1 parent fb92b4d commit 260bb41

File tree

3 files changed

+198
-95
lines changed

3 files changed

+198
-95
lines changed

Diff for: CHANGES

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
4444
autoconf: Add autogen.sh, remove configure and config.h.in and put
4545
these generated files in the release tarball.
4646
Autoconf: Update install-sh script to the latest available version.
47+
Autoconf: Update config.{guess,sub}, timestamps 2024-01-01
4748

4849
DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
4950
Summary for 1.10.5 libpcap release (so far!)

Diff for: config.guess

+50-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2023 Free Software Foundation, Inc.
3+
# Copyright 1992-2024 Free Software Foundation, Inc.
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7-
timestamp='2023-01-01'
7+
timestamp='2024-01-01'
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
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
4747
usage="\
4848
Usage: $0 [OPTION]
4949
50-
Output the configuration name of the system \`$me' is run on.
50+
Output the configuration name of the system '$me' is run on.
5151
5252
Options:
5353
-h, --help print this help, then exit
@@ -60,13 +60,13 @@ version="\
6060
GNU config.guess ($timestamp)
6161
6262
Originally written by Per Bothner.
63-
Copyright 1992-2023 Free Software Foundation, Inc.
63+
Copyright 1992-2024 Free Software Foundation, Inc.
6464
6565
This is free software; see the source for copying conditions. There is NO
6666
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
6767

6868
help="
69-
Try \`$me --help' for more information."
69+
Try '$me --help' for more information."
7070

7171
# Parse command line
7272
while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
102102
# temporary files to be created and, as you can see below, it is a
103103
# headache to deal with in a portable fashion.
104104

105-
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
106-
# use `HOST_CC' if defined, but it is deprecated.
105+
# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
106+
# use 'HOST_CC' if defined, but it is deprecated.
107107

108108
# Portable tmp directory creation inspired by the Autoconf team.
109109

@@ -155,20 +155,26 @@ Linux|GNU|GNU/*)
155155

156156
set_cc_for_build
157157
cat <<-EOF > "$dummy.c"
158+
#if defined(__ANDROID__)
159+
LIBC=android
160+
#else
158161
#include <features.h>
159162
#if defined(__UCLIBC__)
160163
LIBC=uclibc
161164
#elif defined(__dietlibc__)
162165
LIBC=dietlibc
163166
#elif defined(__GLIBC__)
164167
LIBC=gnu
168+
#elif defined(__LLVM_LIBC__)
169+
LIBC=llvm
165170
#else
166171
#include <stdarg.h>
167172
/* First heuristic to detect musl libc. */
168173
#ifdef __DEFINED_va_list
169174
LIBC=musl
170175
#endif
171176
#endif
177+
#endif
172178
EOF
173179
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
174180
eval "$cc_set_libc"
@@ -459,7 +465,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
459465
UNAME_RELEASE=`uname -v`
460466
;;
461467
esac
462-
# Japanese Language versions have a version number like `4.1.3-JL'.
468+
# Japanese Language versions have a version number like '4.1.3-JL'.
463469
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
464470
GUESS=sparc-sun-sunos$SUN_REL
465471
;;
@@ -904,7 +910,7 @@ EOF
904910
fi
905911
;;
906912
*:FreeBSD:*:*)
907-
UNAME_PROCESSOR=`/usr/bin/uname -p`
913+
UNAME_PROCESSOR=`uname -p`
908914
case $UNAME_PROCESSOR in
909915
amd64)
910916
UNAME_PROCESSOR=x86_64 ;;
@@ -976,7 +982,27 @@ EOF
976982
GUESS=$UNAME_MACHINE-unknown-minix
977983
;;
978984
aarch64:Linux:*:*)
979-
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
985+
set_cc_for_build
986+
CPU=$UNAME_MACHINE
987+
LIBCABI=$LIBC
988+
if test "$CC_FOR_BUILD" != no_compiler_found; then
989+
ABI=64
990+
sed 's/^ //' << EOF > "$dummy.c"
991+
#ifdef __ARM_EABI__
992+
#ifdef __ARM_PCS_VFP
993+
ABI=eabihf
994+
#else
995+
ABI=eabi
996+
#endif
997+
#endif
998+
EOF
999+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
1000+
eval "$cc_set_abi"
1001+
case $ABI in
1002+
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
1003+
esac
1004+
fi
1005+
GUESS=$CPU-unknown-linux-$LIBCABI
9801006
;;
9811007
aarch64_be:Linux:*:*)
9821008
UNAME_MACHINE=aarch64_be
@@ -1042,6 +1068,15 @@ EOF
10421068
k1om:Linux:*:*)
10431069
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10441070
;;
1071+
kvx:Linux:*:*)
1072+
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
1073+
;;
1074+
kvx:cos:*:*)
1075+
GUESS=$UNAME_MACHINE-unknown-cos
1076+
;;
1077+
kvx:mbr:*:*)
1078+
GUESS=$UNAME_MACHINE-unknown-mbr
1079+
;;
10451080
loongarch32:Linux:*:* | loongarch64:Linux:*:*)
10461081
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10471082
;;
@@ -1197,7 +1232,7 @@ EOF
11971232
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
11981233
;;
11991234
i*86:OS/2:*:*)
1200-
# If we were able to find `uname', then EMX Unix compatibility
1235+
# If we were able to find 'uname', then EMX Unix compatibility
12011236
# is probably installed.
12021237
GUESS=$UNAME_MACHINE-pc-os2-emx
12031238
;;
@@ -1338,7 +1373,7 @@ EOF
13381373
GUESS=ns32k-sni-sysv
13391374
fi
13401375
;;
1341-
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1376+
PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
13421377
13431378
GUESS=i586-unisys-sysv4
13441379
;;
@@ -1560,6 +1595,9 @@ EOF
15601595
*:Unleashed:*:*)
15611596
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
15621597
;;
1598+
*:Ironclad:*:*)
1599+
GUESS=$UNAME_MACHINE-unknown-ironclad
1600+
;;
15631601
esac
15641602

15651603
# Do we have a guess based on uname results?

0 commit comments

Comments
 (0)