Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 33928a0

Browse files
authored
Update config.guess to 2024年01月01日 and config.sub to 2024年01月01日 (#14898)
``` wget -O build/config.guess https://git.savannah.gnu.org/cgit/config.git/plain/config.guess wget -O build/config.sub https://git.savannah.gnu.org/cgit/config.git/plain/config.sub ```
1 parent be4b10e commit 33928a0

File tree

2 files changed

+174
-79
lines changed

2 files changed

+174
-79
lines changed

‎build/config.guess

Lines changed: 43 additions & 5 deletions
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年06月23日'
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
@@ -60,7 +60,7 @@ 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."
@@ -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"
@@ -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
;;
@@ -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)

AltStyle によって変換されたページ (->オリジナル) /