From 332b1b6b4d6c892021ce4a6f9d930aea55777f33 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 28 Mar 2023 08:05:35 +0200 Subject: [PATCH] rebase of the patches --- .../libcxx/libcxx-silent-failure-arm64.diff | 18 +++++++++--------- .../libcxx/libcxxabi-fix-link-builtins.diff | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index bfa5f565..5a596877 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_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp @@ -8,6 +8,7 @@ // // UNSUPPORTED: no-threads @@ -10,15 +10,15 @@ Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/ // -Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -@@ -11,7 +11,7 @@ +--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/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 // ALLOW_RETRIES: 2 - // dylib support for shared_mutex was added in macosx10.12 --// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} +-// XFAIL: availability-shared_mutex-missing +// XFAIL: * // diff --git a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff index dae292a0..9c4f834d 100644 --- a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff +++ b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff @@ -1,9 +1,9 @@ if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same -Index: llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220517092516+a09af8669396.orig/libcxxabi/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxxabi/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt @@ -77,7 +77,9 @@ else() add_library_flags_if(LIBCXXABI_HAS_C_LIB c) endif()