diff --git a/debian/patches/fix-typo-1018770.diff b/debian/patches/fix-typo-1018770.diff index 8530a49e..0e8e85b4 100644 --- a/debian/patches/fix-typo-1018770.diff +++ b/debian/patches/fix-typo-1018770.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-14-14.0.6/llvm/include/llvm/Target/TargetMachine.h +Index: llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/llvm/include/llvm/Target/TargetMachine.h =================================================================== ---- llvm-toolchain-14-14.0.6.orig/llvm/include/llvm/Target/TargetMachine.h -+++ llvm-toolchain-14-14.0.6/llvm/include/llvm/Target/TargetMachine.h -@@ -439,13 +439,13 @@ public: +--- llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a.orig/llvm/include/llvm/Target/TargetMachine.h ++++ llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/llvm/include/llvm/Target/TargetMachine.h +@@ -447,13 +447,13 @@ public: raw_pwrite_stream &, raw_pwrite_stream *, CodeGenFileType, CGPassBuilderOption, PassInstrumentationCallbacks *) { diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index af28d355..7a266db8 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt -@@ -700,8 +700,11 @@ else () +--- llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/compiler-rt/lib/builtins/CMakeLists.txt +@@ -707,8 +707,11 @@ else () if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG) append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index c47b6e7c..e1ee6a8d 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,13 +10,13 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +Index: llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -@@ -21,6 +21,14 @@ - # error Feature test macro missing. - #endif +--- llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp ++++ llvm-toolchain-15_15.0.1~++20220920090008+b73d2c8c720a/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +@@ -17,6 +17,15 @@ + + #include "test_macros.h" +#if defined(__i386__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) +/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86 @@ -26,6 +26,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/ +#define ATOMIC_LLONG_LOCK_FREE 2 +#endif + - template void checkAlwaysLockFree() { - if (std::atomic::is_always_lock_free) - assert(std::atomic().is_lock_free()); ++ + template + void checkAlwaysLockFree() { + if (std::atomic::is_always_lock_free) {