Skip to content

Commit

Permalink
Refresh patches after changes in upstream (#372)
Browse files Browse the repository at this point in the history
The new llvm-project patch series applies cleanly against upstream
commit 975c05b69db2d23f8d135811d46707a3802ea7fa.
  • Loading branch information
domin144 authored Dec 6, 2023
1 parent dff0d59 commit 5e92e49
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 78 deletions.
17 changes: 8 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,14 @@ 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-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-handle-stdin.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0005-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0006-libc-tests-with-picolibc-Fix-expected-error-message.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0007-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0008-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0009-libc-tests-with-picolibc-mark-two-more-large-tests.patch
${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
)
FetchContent_Declare(llvmproject
GIT_REPOSITORY https://github.com/llvm/llvm-project.git
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 63a0482e56aa558901be3a40b90f47259be416b0 Mon Sep 17 00:00:00 2001
From 847015a9b8fe28d6a39a2e4d37e717f866dea210 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a60b18239d808f3752bd9c56bb1e2b7fe3abf6af Mon Sep 17 00:00:00 2001
From e94b92010b1f50481aa9655bee29ce168e922773 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: [libc++] tests with picolibc: disable large tests
Subject: tests with picolibc: disable large tests

---
libcxx/cmake/caches/Armv7M-picolibc.cmake | 9 ++++++++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b93276297698aafb8396dbd3eb376781dbfb6caa Mon Sep 17 00:00:00 2001
From 54240de4060b3c57eb6dc381f66d2395fa21e288 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5206fd9590e1cb2f2117228c7c61dfe1e6a9a633 Mon Sep 17 00:00:00 2001
From ae1969518c6013b371798e5274dc4b3f533cfc46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
Date: Mon, 23 Oct 2023 14:37:41 +0200
Subject: [libc++] tests with picolibc: handle stdin
Subject: tests with picolibc: handle stdin

Add proper explanation for cin.sh.cpp fail
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1f858e15329d1ca76cb23bdcd6a6234d875da52b Mon Sep 17 00:00:00 2001
From 63ea8fb8d08ba3b66b3a6d68523156dc457df36f 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: [libc++] tests with picolibc: add has-compolete-fenv feature
Subject: tests with picolibc: add has-compolete-fenv feature

---
.../depr.c.headers/fenv_h.compile.pass.cpp | 2 +-
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b9a58fab5a33b6387e4132adda20b13e3b46465f Mon Sep 17 00:00:00 2001
From 5f187ea76f49652df69aad6539275f8d8d27fb77 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: [libc++] tests with picolibc: mark sort test as long one
Subject: tests with picolibc: mark sort test as long one

---
.../std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp | 3 +--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 572e98d53c85953e478feda0f45c50767eaae92a Mon Sep 17 00:00:00 2001
From 783b79866bb492c7a9f0238940cd925390162c24 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: [libc++] tests with picolibc: XFAIL uses of atomics
Subject: tests with picolibc: XFAIL uses of atomics

---
libcxx/test/libcxx/atomics/lit.local.cfg | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7bd2160775f94995f45e7332a378fea587eb2f02 Mon Sep 17 00:00:00 2001
From 1511d6e3211952773ff58a794227f14e243dd7eb 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: [libc++] tests with picolibc: mark two more large tests
Subject: tests with picolibc: mark two more large tests

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

0 comments on commit 5e92e49

Please sign in to comment.