Skip to content

Commit e7df00d

Browse files
committed
[ATfE] Remove downstream patch that defined _LIBCPP_HAS_C8RTOMB_MBRTOC8
PR llvm/llvm-project#152724 adds logic to define the `_LIBCPP_HAS_C8RTOMB_MBRTOC8` macro depending on the picolibc support for `char8_t` functions. With this change we don't need a downstream patch anymore.
1 parent e0793ff commit e7df00d

9 files changed

+22
-77
lines changed

arm-software/embedded/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 623881f1ea465f9c1837981db143f7225108580a Mon Sep 17 00:00:00 2001
1+
From a589b15f0063e5260eceb3ab2a3d5f809577592a Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
33
Date: Mon, 16 Oct 2023 11:35:48 +0200
44
Subject: [libc++] tests with picolibc: xfail one remaining test
@@ -22,5 +22,5 @@ index d8eff69cb53f..e16048df722e 100644
2222

2323
void f() {}
2424
--
25-
2.39.5 (Apple Git-154)
25+
2.43.0
2626

arm-software/embedded/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8a0f8650d58f27ca32948554188b98c8978d1eb6 Mon Sep 17 00:00:00 2001
1+
From dd8af4174590d6588ea70b0b60b22926469cf2cb Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
33
Date: Wed, 15 Nov 2023 12:18:35 +0100
44
Subject: [libc++] tests with picolibc: disable large tests
@@ -9,7 +9,7 @@ Subject: [libc++] tests with picolibc: disable large tests
99
2 files changed, 9 insertions(+), 2 deletions(-)
1010

1111
diff --git a/libcxx/cmake/caches/Armv7M-picolibc.cmake b/libcxx/cmake/caches/Armv7M-picolibc.cmake
12-
index b5f9089308d2..0a83e75ceceb 100644
12+
index 0f8189b45728..9e1ae0832aee 100644
1313
--- a/libcxx/cmake/caches/Armv7M-picolibc.cmake
1414
+++ b/libcxx/cmake/caches/Armv7M-picolibc.cmake
1515
@@ -18,6 +18,9 @@ set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
@@ -22,7 +22,7 @@ index b5f9089308d2..0a83e75ceceb 100644
2222
set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
2323
set(LIBCXX_ENABLE_EXCEPTIONS ON CACHE BOOL "")
2424
set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE STRING "")
25-
@@ -30,12 +33,16 @@ set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "")
25+
@@ -30,13 +33,17 @@ set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "")
2626
set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")
2727
set(LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
2828
# Long tests are prohibitively slow when run via emulation.
@@ -40,8 +40,9 @@ index b5f9089308d2..0a83e75ceceb 100644
4040
+set(LIBUNWIND_TEST_PARAMS "long_tests=False;large_tests=False" CACHE STRING "")
4141
set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
4242
find_program(QEMU_SYSTEM_ARM qemu-system-arm REQUIRED)
43+
4344
diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
44-
index ad131bb3a8a7..ac612c79f71c 100644
45+
index 858347bedce1..b632f79f92ed 100644
4546
--- a/libcxxabi/test/test_demangle.pass.cpp
4647
+++ b/libcxxabi/test/test_demangle.pass.cpp
4748
@@ -7,7 +7,7 @@
@@ -53,7 +54,6 @@ index ad131bb3a8a7..ac612c79f71c 100644
5354

5455
// This test exercises support for char array initializer lists added in
5556
// dd8b266ef.
56-
// UNSUPPORTED: using-built-library-before-llvm-20
5757
--
58-
2.39.5 (Apple Git-154)
58+
2.43.0
5959

arm-software/embedded/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0f8dc80a7642430c8d02c36283766aeb5a59a331 Mon Sep 17 00:00:00 2001
1+
From 4a975e88a71c4aaa0d2a58465944c2dec3e7cedb Mon Sep 17 00:00:00 2001
22
From: Piotr Przybyla <[email protected]>
33
Date: Wed, 15 Nov 2023 16:04:24 +0000
44
Subject: Disable failing compiler-rt test
@@ -8,7 +8,7 @@ Subject: Disable failing compiler-rt test
88
1 file changed, 2 insertions(+)
99

1010
diff --git a/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c b/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
11-
index 2ff65a8b9ec3..98611a75e85f 100644
11+
index 02cfa2f38713..2c04061a2ef6 100644
1212
--- a/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
1313
+++ b/compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
1414
@@ -1,3 +1,5 @@
@@ -18,5 +18,5 @@ index 2ff65a8b9ec3..98611a75e85f 100644
1818
// RUN: %clang_builtins %s %librt -o %t && %run %t
1919

2020
--
21-
2.39.5 (Apple Git-154)
21+
2.43.0
2222

arm-software/embedded/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f5b5a95bd02f6d5bc6e80c238c2e8f7e08985d80 Mon Sep 17 00:00:00 2001
1+
From a7e2b02d940a002b2e1f82608be4919788225c5e Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
33
Date: Thu, 9 Nov 2023 15:25:14 +0100
44
Subject: [libc++] tests with picolibc: XFAIL uses of atomics
@@ -88,10 +88,10 @@ index 000000000000..5ecc58f3e385
8888
+if "has-no-atomics" in config.available_features:
8989
+ config.unsupported = True
9090
diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
91-
index 735eb5ac949d..6ca4e8acb3f4 100644
91+
index 0cb81546665d..3e6204db4d79 100644
9292
--- a/libcxx/utils/libcxx/test/features.py
9393
+++ b/libcxx/utils/libcxx/test/features.py
94-
@@ -215,6 +215,21 @@ DEFAULT_FEATURES = [
94+
@@ -206,6 +206,21 @@ DEFAULT_FEATURES = [
9595
""",
9696
),
9797
),
@@ -114,5 +114,5 @@ index 735eb5ac949d..6ca4e8acb3f4 100644
114114
Feature(
115115
name="32-bit-pointer",
116116
--
117-
2.39.5 (Apple Git-154)
117+
2.43.0
118118

arm-software/embedded/patches/llvm-project/0005-libc-tests-with-picolibc-mark-two-more-large-tests.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0961af52ac015c26829b4dae7fd6879a0b633f44 Mon Sep 17 00:00:00 2001
1+
From c759d8c32846d6bbc542085c3a9fddcfdc81c9cd Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
33
Date: Wed, 22 Nov 2023 16:12:39 +0100
44
Subject: [libc++] tests with picolibc: mark two more large tests
@@ -37,5 +37,5 @@ index 64a6a135adda..057301e6f868 100644
3737
// bool
3838
// regex_search(BidirectionalIterator first, BidirectionalIterator last,
3939
--
40-
2.39.5 (Apple Git-154)
40+
2.43.0
4141

arm-software/embedded/patches/llvm-project/0006-Define-_LIBCPP_HAS_C8RTOMB_MBRTOC8.patch

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2c6b08baa20bb4a7e4a936ecf286a1c9e1f0f8c9 Mon Sep 17 00:00:00 2001
1+
From 782ec714d681c847005c657745ff3798ee315e41 Mon Sep 17 00:00:00 2001
22
From: Victor Campos <[email protected]>
33
Date: Thu, 31 Oct 2024 14:03:58 +0000
44
Subject: [libcxx] Remove xfails due to picolibc's support for char16_t and
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8a5771253787cda5c8caa31b7e8a870840903084 Mon Sep 17 00:00:00 2001
1+
From d1f5b20e10a1c55838ae233d805ca5cd586ba883 Mon Sep 17 00:00:00 2001
22
From: Simi Pallipurath <[email protected]>
33
Date: Tue, 22 Jul 2025 15:08:45 +0100
44
Subject: [Compiler-rt] FVP and QEMU do not support crash signal handling.
@@ -22,5 +22,5 @@ index 2140944b0eec..f3b8bb234f38 100644
2222
// RUN: %expect_crash %run %t 4
2323

2424
--
25-
2.34.1
25+
2.43.0
2626

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From be2b0fe15e9717ddb4a75b0cd4e30b22ab614124 Mon Sep 17 00:00:00 2001
1+
From e30d55732192160b64920e8e319a40907d4bbfe9 Mon Sep 17 00:00:00 2001
22
From: Simi Pallipurath <[email protected]>
33
Date: Tue, 22 Jul 2025 15:10:20 +0100
44
Subject: [Clang] XFAIL tests with -frwpi as ATFE don't have an appropriate
@@ -34,5 +34,5 @@ index 9082d7948511..e79701417b52 100644
3434
// Pre-defined macros for position-independence modes
3535

3636
--
37-
2.34.1
37+
2.43.0
3838

0 commit comments

Comments
 (0)