diff --git a/arm-software/embedded/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch b/arm-software/embedded/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch index b92d1efbbd7e..fe894e123632 100644 --- a/arm-software/embedded/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch +++ b/arm-software/embedded/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch @@ -1,4 +1,4 @@ -From 623881f1ea465f9c1837981db143f7225108580a Mon Sep 17 00:00:00 2001 +From a589b15f0063e5260eceb3ab2a3d5f809577592a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= Date: Mon, 16 Oct 2023 11:35:48 +0200 Subject: [libc++] tests with picolibc: xfail one remaining test @@ -22,5 +22,5 @@ index d8eff69cb53f..e16048df722e 100644 void f() {} -- -2.39.5 (Apple Git-154) +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch b/arm-software/embedded/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch index 8f7a9ba68f07..3dbda214b477 100644 --- a/arm-software/embedded/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch +++ b/arm-software/embedded/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch @@ -1,4 +1,4 @@ -From 8a0f8650d58f27ca32948554188b98c8978d1eb6 Mon Sep 17 00:00:00 2001 +From dd8af4174590d6588ea70b0b60b22926469cf2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= Date: Wed, 15 Nov 2023 12:18:35 +0100 Subject: [libc++] tests with picolibc: disable large tests @@ -9,7 +9,7 @@ Subject: [libc++] tests with picolibc: disable large tests 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libcxx/cmake/caches/Armv7M-picolibc.cmake b/libcxx/cmake/caches/Armv7M-picolibc.cmake -index b5f9089308d2..0a83e75ceceb 100644 +index 0f8189b45728..9e1ae0832aee 100644 --- a/libcxx/cmake/caches/Armv7M-picolibc.cmake +++ b/libcxx/cmake/caches/Armv7M-picolibc.cmake @@ -18,6 +18,9 @@ set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "") @@ -22,7 +22,7 @@ index b5f9089308d2..0a83e75ceceb 100644 set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "") set(LIBCXX_ENABLE_EXCEPTIONS ON CACHE BOOL "") set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE STRING "") -@@ -30,12 +33,16 @@ set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "") +@@ -30,13 +33,17 @@ set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "") set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "") set(LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "") # Long tests are prohibitively slow when run via emulation. @@ -40,8 +40,9 @@ index b5f9089308d2..0a83e75ceceb 100644 +set(LIBUNWIND_TEST_PARAMS "long_tests=False;large_tests=False" CACHE STRING "") set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") find_program(QEMU_SYSTEM_ARM qemu-system-arm REQUIRED) + diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp -index ad131bb3a8a7..ac612c79f71c 100644 +index 858347bedce1..b632f79f92ed 100644 --- a/libcxxabi/test/test_demangle.pass.cpp +++ b/libcxxabi/test/test_demangle.pass.cpp @@ -7,7 +7,7 @@ @@ -53,7 +54,6 @@ index ad131bb3a8a7..ac612c79f71c 100644 // This test exercises support for char array initializer lists added in // dd8b266ef. - // UNSUPPORTED: using-built-library-before-llvm-20 -- -2.39.5 (Apple Git-154) +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch b/arm-software/embedded/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch index 290bf4bfe3c4..5691784cd560 100644 --- a/arm-software/embedded/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch +++ b/arm-software/embedded/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch @@ -1,4 +1,4 @@ -From 0f8dc80a7642430c8d02c36283766aeb5a59a331 Mon Sep 17 00:00:00 2001 +From 4a975e88a71c4aaa0d2a58465944c2dec3e7cedb Mon Sep 17 00:00:00 2001 From: Piotr Przybyla Date: Wed, 15 Nov 2023 16:04:24 +0000 Subject: Disable failing compiler-rt test @@ -8,7 +8,7 @@ Subject: Disable failing compiler-rt test 1 file changed, 2 insertions(+) diff --git a/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c b/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c -index 2ff65a8b9ec3..98611a75e85f 100644 +index 02cfa2f38713..2c04061a2ef6 100644 --- a/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c +++ b/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c @@ -1,3 +1,5 @@ @@ -18,5 +18,5 @@ index 2ff65a8b9ec3..98611a75e85f 100644 // RUN: %clang_builtins %s %librt -o %t && %run %t -- -2.39.5 (Apple Git-154) +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch b/arm-software/embedded/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch index 4aafd43f6574..8cd800b7cdc8 100644 --- a/arm-software/embedded/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch +++ b/arm-software/embedded/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch @@ -1,4 +1,4 @@ -From f5b5a95bd02f6d5bc6e80c238c2e8f7e08985d80 Mon Sep 17 00:00:00 2001 +From a7e2b02d940a002b2e1f82608be4919788225c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= Date: Thu, 9 Nov 2023 15:25:14 +0100 Subject: [libc++] tests with picolibc: XFAIL uses of atomics @@ -88,10 +88,10 @@ index 000000000000..5ecc58f3e385 +if "has-no-atomics" in config.available_features: + config.unsupported = True diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py -index 735eb5ac949d..6ca4e8acb3f4 100644 +index 0cb81546665d..3e6204db4d79 100644 --- a/libcxx/utils/libcxx/test/features.py +++ b/libcxx/utils/libcxx/test/features.py -@@ -215,6 +215,21 @@ DEFAULT_FEATURES = [ +@@ -206,6 +206,21 @@ DEFAULT_FEATURES = [ """, ), ), @@ -114,5 +114,5 @@ index 735eb5ac949d..6ca4e8acb3f4 100644 Feature( name="32-bit-pointer", -- -2.39.5 (Apple Git-154) +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0005-libc-tests-with-picolibc-mark-two-more-large-tests.patch b/arm-software/embedded/patches/llvm-project/0005-libc-tests-with-picolibc-mark-two-more-large-tests.patch index 16cfb4a335fc..39390a18790b 100644 --- a/arm-software/embedded/patches/llvm-project/0005-libc-tests-with-picolibc-mark-two-more-large-tests.patch +++ b/arm-software/embedded/patches/llvm-project/0005-libc-tests-with-picolibc-mark-two-more-large-tests.patch @@ -1,4 +1,4 @@ -From 0961af52ac015c26829b4dae7fd6879a0b633f44 Mon Sep 17 00:00:00 2001 +From c759d8c32846d6bbc542085c3a9fddcfdc81c9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= Date: Wed, 22 Nov 2023 16:12:39 +0100 Subject: [libc++] tests with picolibc: mark two more large tests @@ -37,5 +37,5 @@ index 64a6a135adda..057301e6f868 100644 // bool // regex_search(BidirectionalIterator first, BidirectionalIterator last, -- -2.39.5 (Apple Git-154) +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0006-Define-_LIBCPP_HAS_C8RTOMB_MBRTOC8.patch b/arm-software/embedded/patches/llvm-project/0006-Define-_LIBCPP_HAS_C8RTOMB_MBRTOC8.patch deleted file mode 100644 index ac73bd5ee3d6..000000000000 --- a/arm-software/embedded/patches/llvm-project/0006-Define-_LIBCPP_HAS_C8RTOMB_MBRTOC8.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9011c0e821d5b1563dc2dc6370f29c529e55f41f Mon Sep 17 00:00:00 2001 -From: Victor Campos -Date: Thu, 31 Oct 2024 09:58:34 +0000 -Subject: Define _LIBCPP_HAS_C8RTOMB_MBRTOC8 - -LLVM libcxx does not define the `char8_t` related functions, instead -delegating their definitions to the underlying C library. - -libcxx defines a macro called `_LIBCPP_HAS_C8RTOMB_MBRTOC8` when it -infers that the underlying C library provides these functions. - -picolibc provides the `char8_t` related functions regardless of the C++ -version used, but this support only landed after version 1.8.8 and, at -the time of writing, has not made into any released version yet. - -This is a temporary fix and should be removed when a picolibc release -includes the support for `char8_t` and its related functions. When it's -time to implement a proper solution, one needs to create logic to detect -the picolibc version and define the macro accordingly. The macros that -govern picolibc version are in `picolibc.h`. ---- - libcxx/include/__config | 17 ++--------------- - 1 file changed, 2 insertions(+), 15 deletions(-) - -diff --git a/libcxx/include/__config b/libcxx/include/__config -index 1cf80a46686a..615433869a4e 100644 ---- a/libcxx/include/__config -+++ b/libcxx/include/__config -@@ -1021,21 +1021,8 @@ typedef __char32_t char32_t; - // functions is gradually being added to existing C libraries. The conditions - // below check for known C library versions and conditions under which these - // functions are declared by the C library. --// --// GNU libc 2.36 and newer declare c8rtomb() and mbrtoc8() in C++ modes if --// __cpp_char8_t is defined or if C2X extensions are enabled. Determining --// the latter depends on internal GNU libc details that are not appropriate --// to depend on here, so any declarations present when __cpp_char8_t is not --// defined are ignored. --# if defined(_LIBCPP_GLIBC_PREREQ) --# if _LIBCPP_GLIBC_PREREQ(2, 36) && defined(__cpp_char8_t) --# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1 --# else --# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0 --# endif --# else --# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0 --# endif -+// For picolibc: -+#define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1 - - // There are a handful of public standard library types that are intended to - // support CTAD but don't need any explicit deduction guides to do so. This --- -2.43.0 - diff --git a/arm-software/embedded/patches/llvm-project/0007-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch b/arm-software/embedded/patches/llvm-project/0006-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch similarity index 96% rename from arm-software/embedded/patches/llvm-project/0007-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch rename to arm-software/embedded/patches/llvm-project/0006-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch index 0929944a85bb..0bd2e32b8530 100644 --- a/arm-software/embedded/patches/llvm-project/0007-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch +++ b/arm-software/embedded/patches/llvm-project/0006-libcxx-Remove-xfails-due-to-picolibc-s-support-for-c.patch @@ -1,4 +1,4 @@ -From 2c6b08baa20bb4a7e4a936ecf286a1c9e1f0f8c9 Mon Sep 17 00:00:00 2001 +From 782ec714d681c847005c657745ff3798ee315e41 Mon Sep 17 00:00:00 2001 From: Victor Campos Date: Thu, 31 Oct 2024 14:03:58 +0000 Subject: [libcxx] Remove xfails due to picolibc's support for char16_t and diff --git a/arm-software/embedded/patches/llvm-project/0008-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch b/arm-software/embedded/patches/llvm-project/0007-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch similarity index 92% rename from arm-software/embedded/patches/llvm-project/0008-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch rename to arm-software/embedded/patches/llvm-project/0007-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch index 87effa4edb0e..004dd4744c21 100644 --- a/arm-software/embedded/patches/llvm-project/0008-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch +++ b/arm-software/embedded/patches/llvm-project/0007-Compiler-rt-FVP-and-QEMU-do-not-support-crash-signal.patch @@ -1,4 +1,4 @@ -From 8a5771253787cda5c8caa31b7e8a870840903084 Mon Sep 17 00:00:00 2001 +From d1f5b20e10a1c55838ae233d805ca5cd586ba883 Mon Sep 17 00:00:00 2001 From: Simi Pallipurath Date: Tue, 22 Jul 2025 15:08:45 +0100 Subject: [Compiler-rt] FVP and QEMU do not support crash signal handling. @@ -22,5 +22,5 @@ index 2140944b0eec..f3b8bb234f38 100644 // RUN: %expect_crash %run %t 4 -- -2.34.1 +2.43.0 diff --git a/arm-software/embedded/patches/llvm-project/0009-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch b/arm-software/embedded/patches/llvm-project/0008-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch similarity index 96% rename from arm-software/embedded/patches/llvm-project/0009-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch rename to arm-software/embedded/patches/llvm-project/0008-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch index 78edbe4be888..8dfab90ae844 100644 --- a/arm-software/embedded/patches/llvm-project/0009-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch +++ b/arm-software/embedded/patches/llvm-project/0008-Clang-XFAIL-tests-with-frwpi-as-ATFE-don-t-have-an-a.patch @@ -1,4 +1,4 @@ -From be2b0fe15e9717ddb4a75b0cd4e30b22ab614124 Mon Sep 17 00:00:00 2001 +From e30d55732192160b64920e8e319a40907d4bbfe9 Mon Sep 17 00:00:00 2001 From: Simi Pallipurath Date: Tue, 22 Jul 2025 15:10:20 +0100 Subject: [Clang] XFAIL tests with -frwpi as ATFE don't have an appropriate @@ -34,5 +34,5 @@ index 9082d7948511..e79701417b52 100644 // Pre-defined macros for position-independence modes -- -2.34.1 +2.43.0