Skip to content

Commit 64b2eed

Browse files
committed
depends: update to latest config.guess (2024-07-27)
1 parent 4db8121 commit 64b2eed

File tree

1 file changed

+94
-27
lines changed

1 file changed

+94
-27
lines changed

depends/config.guess

+94-27
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2021 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='2021-06-03'
7+
timestamp='2024-07-27'
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
11-
# the Free Software Foundation; either version 3 of the License, or
11+
# the Free Software Foundation, either version 3 of the License, or
1212
# (at your option) any later version.
1313
#
1414
# This program is distributed in the hope that it will be useful, but
@@ -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-2021 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

@@ -123,7 +123,7 @@ set_cc_for_build() {
123123
dummy=$tmp/dummy
124124
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
125125
,,) echo "int x;" > "$dummy.c"
126-
for driver in cc gcc c89 c99 ; do
126+
for driver in cc gcc c17 c99 c89 ; do
127127
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
128128
CC_FOR_BUILD=$driver
129129
break
@@ -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"
@@ -437,7 +443,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
437443
# This test works for both compilers.
438444
if test "$CC_FOR_BUILD" != no_compiler_found; then
439445
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
440-
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
446+
(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
441447
grep IS_64BIT_ARCH >/dev/null
442448
then
443449
SUN_ARCH=x86_64
@@ -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
;;
@@ -628,7 +634,8 @@ EOF
628634
sed 's/^ //' << EOF > "$dummy.c"
629635
#include <sys/systemcfg.h>
630636
631-
main()
637+
int
638+
main ()
632639
{
633640
if (!__power_pc())
634641
exit(1);
@@ -712,7 +719,8 @@ EOF
712719
#include <stdlib.h>
713720
#include <unistd.h>
714721
715-
int main ()
722+
int
723+
main ()
716724
{
717725
#if defined(_SC_KERNEL_BITS)
718726
long bits = sysconf(_SC_KERNEL_BITS);
@@ -904,7 +912,7 @@ EOF
904912
fi
905913
;;
906914
*:FreeBSD:*:*)
907-
UNAME_PROCESSOR=`/usr/bin/uname -p`
915+
UNAME_PROCESSOR=`uname -p`
908916
case $UNAME_PROCESSOR in
909917
amd64)
910918
UNAME_PROCESSOR=x86_64 ;;
@@ -929,6 +937,9 @@ EOF
929937
i*:PW*:*)
930938
GUESS=$UNAME_MACHINE-pc-pw32
931939
;;
940+
*:SerenityOS:*:*)
941+
GUESS=$UNAME_MACHINE-pc-serenity
942+
;;
932943
*:Interix*:*)
933944
case $UNAME_MACHINE in
934945
x86)
@@ -963,11 +974,37 @@ EOF
963974
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
964975
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
965976
;;
977+
x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
978+
GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
979+
;;
980+
*:[Mm]anagarm:*:*)
981+
GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
982+
;;
966983
*:Minix:*:*)
967984
GUESS=$UNAME_MACHINE-unknown-minix
968985
;;
969986
aarch64:Linux:*:*)
970-
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
987+
set_cc_for_build
988+
CPU=$UNAME_MACHINE
989+
LIBCABI=$LIBC
990+
if test "$CC_FOR_BUILD" != no_compiler_found; then
991+
ABI=64
992+
sed 's/^ //' << EOF > "$dummy.c"
993+
#ifdef __ARM_EABI__
994+
#ifdef __ARM_PCS_VFP
995+
ABI=eabihf
996+
#else
997+
ABI=eabi
998+
#endif
999+
#endif
1000+
EOF
1001+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
1002+
eval "$cc_set_abi"
1003+
case $ABI in
1004+
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
1005+
esac
1006+
fi
1007+
GUESS=$CPU-unknown-linux-$LIBCABI
9711008
;;
9721009
aarch64_be:Linux:*:*)
9731010
UNAME_MACHINE=aarch64_be
@@ -1033,7 +1070,16 @@ EOF
10331070
k1om:Linux:*:*)
10341071
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10351072
;;
1036-
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
1073+
kvx:Linux:*:*)
1074+
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
1075+
;;
1076+
kvx:cos:*:*)
1077+
GUESS=$UNAME_MACHINE-unknown-cos
1078+
;;
1079+
kvx:mbr:*:*)
1080+
GUESS=$UNAME_MACHINE-unknown-mbr
1081+
;;
1082+
loongarch32:Linux:*:* | loongarch64:Linux:*:*)
10371083
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10381084
;;
10391085
m32r*:Linux:*:*)
@@ -1148,16 +1194,27 @@ EOF
11481194
;;
11491195
x86_64:Linux:*:*)
11501196
set_cc_for_build
1197+
CPU=$UNAME_MACHINE
11511198
LIBCABI=$LIBC
11521199
if test "$CC_FOR_BUILD" != no_compiler_found; then
1153-
if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
1154-
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1155-
grep IS_X32 >/dev/null
1156-
then
1157-
LIBCABI=${LIBC}x32
1158-
fi
1200+
ABI=64
1201+
sed 's/^ //' << EOF > "$dummy.c"
1202+
#ifdef __i386__
1203+
ABI=x86
1204+
#else
1205+
#ifdef __ILP32__
1206+
ABI=x32
1207+
#endif
1208+
#endif
1209+
EOF
1210+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
1211+
eval "$cc_set_abi"
1212+
case $ABI in
1213+
x86) CPU=i686 ;;
1214+
x32) LIBCABI=${LIBC}x32 ;;
1215+
esac
11591216
fi
1160-
GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
1217+
GUESS=$CPU-pc-linux-$LIBCABI
11611218
;;
11621219
xtensa*:Linux:*:*)
11631220
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1177,7 +1234,7 @@ EOF
11771234
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
11781235
;;
11791236
i*86:OS/2:*:*)
1180-
# If we were able to find `uname', then EMX Unix compatibility
1237+
# If we were able to find 'uname', then EMX Unix compatibility
11811238
# is probably installed.
11821239
GUESS=$UNAME_MACHINE-pc-os2-emx
11831240
;;
@@ -1318,7 +1375,7 @@ EOF
13181375
GUESS=ns32k-sni-sysv
13191376
fi
13201377
;;
1321-
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1378+
PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
13221379
13231380
GUESS=i586-unisys-sysv4
13241381
;;
@@ -1364,8 +1421,11 @@ EOF
13641421
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
13651422
GUESS=i586-pc-haiku
13661423
;;
1367-
x86_64:Haiku:*:*)
1368-
GUESS=x86_64-unknown-haiku
1424+
ppc:Haiku:*:*) # Haiku running on Apple PowerPC
1425+
GUESS=powerpc-apple-haiku
1426+
;;
1427+
*:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
1428+
GUESS=$UNAME_MACHINE-unknown-haiku
13691429
;;
13701430
SX-4:SUPER-UX:*:*)
13711431
GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1522,6 +1582,9 @@ EOF
15221582
i*86:rdos:*:*)
15231583
GUESS=$UNAME_MACHINE-pc-rdos
15241584
;;
1585+
i*86:Fiwix:*:*)
1586+
GUESS=$UNAME_MACHINE-pc-fiwix
1587+
;;
15251588
*:AROS:*:*)
15261589
GUESS=$UNAME_MACHINE-unknown-aros
15271590
;;
@@ -1534,6 +1597,9 @@ EOF
15341597
*:Unleashed:*:*)
15351598
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
15361599
;;
1600+
*:Ironclad:*:*)
1601+
GUESS=$UNAME_MACHINE-unknown-ironclad
1602+
;;
15371603
esac
15381604

15391605
# Do we have a guess based on uname results?
@@ -1557,6 +1623,7 @@ cat > "$dummy.c" <<EOF
15571623
#endif
15581624
#endif
15591625
#endif
1626+
int
15601627
main ()
15611628
{
15621629
#if defined (sony)

0 commit comments

Comments
 (0)