Skip to content

Commit d95a4fa

Browse files
committed
Update a downstream patch for altered context (NFC)
This patch failed to apply for me in a manual `git am`, because the upstream addition of `ADDITIONAL_COMPILE_FLAGS` was just close enough to our change to confuse git. Regenerated that hunk. Now it still makes the same change, just without complaining.
1 parent b034a7a commit d95a4fa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ index 000000000000..5ecc58f3e385
3939
+if "has-no-atomics" in config.available_features:
4040
+ config.unsupported = True
4141
diff --git a/libcxx/test/libcxx/thread/thread.stoptoken/intrusive_shared_ptr.pass.cpp b/libcxx/test/libcxx/thread/thread.stoptoken/intrusive_shared_ptr.pass.cpp
42-
index 47440015f2c5..4350de3dfa65 100644
42+
index 99d4226662a0..243aa21c87b4 100644
4343
--- a/libcxx/test/libcxx/thread/thread.stoptoken/intrusive_shared_ptr.pass.cpp
4444
+++ b/libcxx/test/libcxx/thread/thread.stoptoken/intrusive_shared_ptr.pass.cpp
4545
@@ -7,6 +7,8 @@
@@ -49,8 +49,8 @@ index 47440015f2c5..4350de3dfa65 100644
4949
+// XFAIL: has-no-atomics
5050
+
5151
// UNSUPPORTED: c++03, c++11, c++14, c++17
52+
// ADDITIONAL_COMPILE_FLAGS: -Wno-private-header
5253

53-
#include <__stop_token/intrusive_shared_ptr.h>
5454
diff --git a/libcxx/test/std/atomics/lit.local.cfg b/libcxx/test/std/atomics/lit.local.cfg
5555
new file mode 100644
5656
index 000000000000..5ecc58f3e385

0 commit comments

Comments
 (0)