Skip to content

Commit ce3abd4

Browse files
committed
Synchronize config.sub and config.guess with their upstream master versions.
Brings in: commit 28ea239c53a2d5d8800c472bc2452eaa16e37af2 config.sub: Remove windows-gnu commit a6976af01b0c6206561782183a0db42124b19f7b config.sub: recognise ARM64EC machine type commit 4e60c54be77f743ff8018ab58fb36fd8bc055e2a config.sub: allow aarch64c-unknown-freebsd commit e4786449e1c26716e3f9ea182caf472e4dbc96e0 config.guess: invoke "uname -p" from PATH for non-arm FreeBSD commit 021155df7fad97a5ae1baa354e15a03ea14500b4 config.guess: Detect Android (as opposed to GNU/Linux) commit 6c78704d542cebfb56d17474fe9f8395e9defb94 config.sub: add javascript-*-ghcjs commit 2a7c4b64d4aec5c3a8a975625f0f8c369d365667 testsuite: add coverage for vendor-clobbering commit 39c49ea712cba8ae6613ef85ab22fe7c552b48b0 config.sub: Systematize parsing of machine code formats commit d4e37b5868ef910e3e52744c34408084bb13051c config.sub: Handle arbitrary MIPS CPU names commit af8d803a82436779d35ea389888788c78677804e config.guess (aarch64:Linux:*:*): Detect 32-bit ABI commit 602766470c886df7ae07bcfd7dcf532f0783d3e0 Add KVX MPPA detection commit be68d790b6bc7dd84982fa6760f1448e92849e63 config.sub: Add Apple tvOS and watchOS commit 998ba1414387b4ce1a519be234e1609bc7912e0c config.sub: Accept $cpu-$vendor-none-{coff,elf}
1 parent e493ba6 commit ce3abd4

File tree

2 files changed

+141
-72
lines changed

2 files changed

+141
-72
lines changed

Diff for: config.guess

+27-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

7-
timestamp='2023-06-23'
7+
timestamp='2023-08-22'
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
@@ -155,6 +155,9 @@ 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
@@ -169,6 +172,7 @@ Linux|GNU|GNU/*)
169172
LIBC=musl
170173
#endif
171174
#endif
175+
#endif
172176
EOF
173177
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
174178
eval "$cc_set_libc"
@@ -904,7 +908,7 @@ EOF
904908
fi
905909
;;
906910
*:FreeBSD:*:*)
907-
UNAME_PROCESSOR=`/usr/bin/uname -p`
911+
UNAME_PROCESSOR=`uname -p`
908912
case $UNAME_PROCESSOR in
909913
amd64)
910914
UNAME_PROCESSOR=x86_64 ;;
@@ -976,7 +980,27 @@ EOF
976980
GUESS=$UNAME_MACHINE-unknown-minix
977981
;;
978982
aarch64:Linux:*:*)
979-
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
983+
set_cc_for_build
984+
CPU=$UNAME_MACHINE
985+
LIBCABI=$LIBC
986+
if test "$CC_FOR_BUILD" != no_compiler_found; then
987+
ABI=64
988+
sed 's/^ //' << EOF > "$dummy.c"
989+
#ifdef __ARM_EABI__
990+
#ifdef __ARM_PCS_VFP
991+
ABI=eabihf
992+
#else
993+
ABI=eabi
994+
#endif
995+
#endif
996+
EOF
997+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
998+
eval "$cc_set_abi"
999+
case $ABI in
1000+
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
1001+
esac
1002+
fi
1003+
GUESS=$CPU-unknown-linux-$LIBCABI
9801004
;;
9811005
aarch64_be:Linux:*:*)
9821006
UNAME_MACHINE=aarch64_be

0 commit comments

Comments
 (0)