Skip to content

Commit b29ffae

Browse files
committed
update config.guess and config.sub from mainstream
1 parent 55dcc1e commit b29ffae

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

config.guess

Lines changed: 8 additions & 3 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-08-22'
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."
@@ -165,6 +165,8 @@ Linux|GNU|GNU/*)
165165
LIBC=dietlibc
166166
#elif defined(__GLIBC__)
167167
LIBC=gnu
168+
#elif defined(__LLVM_LIBC__)
169+
LIBC=llvm
168170
#else
169171
#include <stdarg.h>
170172
/* First heuristic to detect musl libc. */
@@ -1593,6 +1595,9 @@ EOF
15931595
*:Unleashed:*:*)
15941596
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
15951597
;;
1598+
*:Ironclad:*:*)
1599+
GUESS=$UNAME_MACHINE-unknown-ironclad
1600+
;;
15961601
esac
15971602

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

config.sub

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
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-09-19'
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
@@ -76,7 +76,7 @@ Report bugs and patches to <[email protected]>."
7676
version="\
7777
GNU config.sub ($timestamp)
7878
79-
Copyright 1992-2023 Free Software Foundation, Inc.
79+
Copyright 1992-2024 Free Software Foundation, Inc.
8080
8181
This is free software; see the source for copying conditions. There is NO
8282
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1222,6 +1222,7 @@ case $cpu-$vendor in
12221222
| moxie \
12231223
| mt \
12241224
| msp430 \
1225+
| nanomips* \
12251226
| nds32 | nds32le | nds32be \
12261227
| nfp \
12271228
| nios | nios2 | nios2eb | nios2el \
@@ -1253,6 +1254,7 @@ case $cpu-$vendor in
12531254
| ubicom32 \
12541255
| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
12551256
| vax \
1257+
| vc4 \
12561258
| visium \
12571259
| w65 \
12581260
| wasm32 | wasm64 \
@@ -1597,7 +1599,7 @@ case $cpu-$vendor in
15971599
os=
15981600
obj=elf
15991601
;;
1600-
mips*-*)
1602+
mips*-*|nanomips*-*)
16011603
os=
16021604
obj=elf
16031605
;;
@@ -1721,7 +1723,7 @@ fi
17211723

17221724
case $os in
17231725
# Sometimes we do "kernel-libc", so those need to count as OSes.
1724-
musl* | newlib* | relibc* | uclibc*)
1726+
llvm* | musl* | newlib* | relibc* | uclibc*)
17251727
;;
17261728
# Likewise for "kernel-abi"
17271729
eabi* | gnueabi*)
@@ -1766,12 +1768,19 @@ case $os in
17661768
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
17671769
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
17681770
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
1769-
| fiwix* | mlibc* | cos* | mbr* )
1771+
| fiwix* | mlibc* | cos* | mbr* | ironclad* )
17701772
;;
17711773
# This one is extra strict with allowed versions
17721774
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
17731775
# Don't forget version if it is 3.2v4 or newer.
17741776
;;
1777+
# This refers to builds using the UEFI calling convention
1778+
# (which depends on the architecture) and PE file format.
1779+
# Note that this is both a different calling convention and
1780+
# different file format than that of GNU-EFI
1781+
# (x86_64-w64-mingw32).
1782+
uefi)
1783+
;;
17751784
none)
17761785
;;
17771786
kernel* | msvc* )
@@ -1818,16 +1827,18 @@ esac
18181827
# As a final step for OS-related things, validate the OS-kernel combination
18191828
# (given a valid OS), if there is a kernel.
18201829
case $kernel-$os-$obj in
1821-
linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
1822-
| linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
1830+
linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
1831+
| linux-mlibc*- | linux-musl*- | linux-newlib*- \
1832+
| linux-relibc*- | linux-uclibc*- )
18231833
;;
18241834
uclinux-uclibc*- )
18251835
;;
18261836
managarm-mlibc*- | managarm-kernel*- )
18271837
;;
18281838
windows*-msvc*-)
18291839
;;
1830-
-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
1840+
-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
1841+
| -uclibc*- )
18311842
# These are just libc implementations, not actual OSes, and thus
18321843
# require a kernel.
18331844
echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2

0 commit comments

Comments
 (0)