From c9aff540ee52d1bb3ece2bfadf30d4f60d433f7f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 2 Jul 2021 00:34:02 +0200 Subject: [PATCH] rebase of the patches --- .../libcxx/libcxx-silent-failure-arm64.diff | 21 ++++++------- .../libcxx/libcxx-silent-test-libcxx.diff | 30 +++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index 6992a1bd..21c78f22 100644 --- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff +++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp @@ -8,6 +8,7 @@ // // UNSUPPORTED: libcpp-has-no-threads @@ -10,14 +10,15 @@ Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/ // -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -@@ -13,6 +13,7 @@ - // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 - // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 - // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +@@ -10,7 +10,7 @@ + // UNSUPPORTED: c++03, c++11 + + // dylib support for shared_mutex was added in macosx10.12 +-// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} +// XFAIL: * // ALLOW_RETRIES: 2 diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff index 3462ffbb..d9b6e654 100644 --- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff +++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp @@ -11,6 +11,8 @@ // template // RealType generate_canonical(URNG& g); @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/re/re.traits/isctype.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/re/re.traits/isctype.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/re/re.traits/isctype.pass.cpp +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/re/re.traits/isctype.pass.cpp @@ -14,6 +14,7 @@ // bool isctype(charT c, char_class_type f) const; @@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxxabi/test/catch_multi_level_pointer.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxxabi/test/catch_multi_level_pointer.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxxabi/test/catch_multi_level_pointer.pass.cpp -@@ -12,6 +12,8 @@ - // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 - // XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxxabi/test/catch_multi_level_pointer.pass.cpp +@@ -11,6 +11,8 @@ + // 1b00fc5d8133 made it in the dylib in macOS 10.11 + // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} +// XFAIL: * + #include #include #include -Index: llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210508110942+492173d42b32.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210508110942+492173d42b32/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +--- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp ++++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp @@ -15,6 +15,8 @@ // template void construct(T* p, Args&&... args);