Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh patches after one of them entered upstream #373

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Refresh patches after one of them entered upstream #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,13 @@ read_repo_version(${LLVM_TOOLCHAIN_C_LIBRARY} ${LLVM_TOOLCHAIN_C_LIBRARY})
# git format-patch -k origin/main
set(
llvm_project_patches
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0001-xfail-two-remaining-libcxx-with-picolibc-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0002-tests-with-picolibc-disable-large-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0004-tests-with-picolibc-handle-stdin.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0005-tests-with-picolibc-add-has-compolete-fenv-feature.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0006-tests-with-picolibc-mark-sort-test-as-long-one.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0007-tests-with-picolibc-XFAIL-uses-of-atomics.patch
${CMAKE_CURRENT_SOURCE_DIR}patches/llvm-project/0008-tests-with-picolibc-mark-two-more-large-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-two-remaining-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0004-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0005-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0006-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0007-libc-tests-with-picolibc-mark-two-more-large-tests.patch
)
FetchContent_Declare(llvmproject
GIT_REPOSITORY https://github.com/llvm/llvm-project.git
Expand Down
4 changes: 2 additions & 2 deletions ...emaining-libcxx-with-picolibc-tests.patch → ...-picolibc-xfail-two-remaining-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 847015a9b8fe28d6a39a2e4d37e717f866dea210 Mon Sep 17 00:00:00 2001
From c3b32b7c3951171770507dae2ce53c73ed593dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Mon, 16 Oct 2023 11:35:48 +0200
Subject: xfail two remaining libcxx with picolibc tests
Subject: [libc++] tests with picolibc: xfail two remaining tests

---
.../cmp/cmp.alg/strong_order_long_double.verify.cpp | 5 +++++
Expand Down
4 changes: 2 additions & 2 deletions ...s-with-picolibc-disable-large-tests.patch → ...s-with-picolibc-disable-large-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e94b92010b1f50481aa9655bee29ce168e922773 Mon Sep 17 00:00:00 2001
From 30d78a36b959e8bc829bc2f37249e5d043dfe4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Wed, 15 Nov 2023 12:18:35 +0100
Subject: tests with picolibc: disable large tests
Subject: [libc++] tests with picolibc: disable large tests

---
libcxx/cmake/caches/Armv7M-picolibc.cmake | 9 ++++++++-
Expand Down
2 changes: 1 addition & 1 deletion patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 54240de4060b3c57eb6dc381f66d2395fa21e288 Mon Sep 17 00:00:00 2001
From 84e4446bec411cfd3bede2aa9990ec587b83767c Mon Sep 17 00:00:00 2001
From: Piotr Przybyla <[email protected]>
Date: Wed, 15 Nov 2023 16:04:24 +0000
Subject: Disable failing compiler-rt test
Expand Down
4 changes: 2 additions & 2 deletions ...libc-add-has-compolete-fenv-feature.patch → ...icolibc-add-has-compolete-fenv-feat.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 63ea8fb8d08ba3b66b3a6d68523156dc457df36f Mon Sep 17 00:00:00 2001
From f95049b382c9d0f163dce8f3be5254649be8b154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Tue, 24 Oct 2023 12:12:27 +0200
Subject: tests with picolibc: add has-compolete-fenv feature
Subject: [libc++] tests with picolibc: add has-compolete-fenv feature

---
.../depr.c.headers/fenv_h.compile.pass.cpp | 2 +-
Expand Down
44 changes: 0 additions & 44 deletions patches/llvm-project/0004-tests-with-picolibc-handle-stdin.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...picolibc-mark-sort-test-as-long-one.patch → ...picolibc-mark-sort-test-as-long-one.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5f187ea76f49652df69aad6539275f8d8d27fb77 Mon Sep 17 00:00:00 2001
From 6470b7a59aa49acfac34d38ede05be5549c9758d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Thu, 9 Nov 2023 14:14:30 +0100
Subject: tests with picolibc: mark sort test as long one
Subject: [libc++] tests with picolibc: mark sort test as long one

---
.../std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp | 3 +--
Expand Down
4 changes: 2 additions & 2 deletions ...with-picolibc-XFAIL-uses-of-atomics.patch → ...with-picolibc-XFAIL-uses-of-atomics.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 783b79866bb492c7a9f0238940cd925390162c24 Mon Sep 17 00:00:00 2001
From 7003d597f4b91c793851f58e8ad60a9144faafbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Thu, 9 Nov 2023 15:25:14 +0100
Subject: tests with picolibc: XFAIL uses of atomics
Subject: [libc++] tests with picolibc: XFAIL uses of atomics

---
libcxx/test/libcxx/atomics/lit.local.cfg | 3 +++
Expand Down
4 changes: 2 additions & 2 deletions ...-picolibc-mark-two-more-large-tests.patch → ...-picolibc-mark-two-more-large-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1511d6e3211952773ff58a794227f14e243dd7eb Mon Sep 17 00:00:00 2001
From 2f21fa1993aac07fa27bd138ba5c043817f1e8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Wed, 22 Nov 2023 16:12:39 +0100
Subject: tests with picolibc: mark two more large tests
Subject: [libc++] tests with picolibc: mark two more large tests

---
libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp | 3 +++
Expand Down
Loading