From 1d8b2e734daf09e2de2f50dbe7a3b67ad2c7a008 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 22:50:24 +0100 Subject: [PATCH] rebase of the patches --- debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff index 46d63e30..8d2e078e 100644 --- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff @@ -1,15 +1,19 @@ -Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h +Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h -+++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h -@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co - #endif +--- llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5.orig/libcxx/include/__atomic/aliases.h ++++ llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h +@@ -96,6 +96,7 @@ using __largest_lock_free_type = char; + # endif - #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) + # ifndef _LIBCPP_NO_LOCK_FREE_TYPES +#ifndef NO_LOCK_FREE - using atomic_signed_lock_free = atomic<__libcpp_signed_lock_free>; - using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>; - #endif + using __contention_t_or_largest = + __conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value, + __cxx_contention_t, +@@ -105,6 +106,8 @@ using atomic_signed_lock_free = atomic + using atomic_unsigned_lock_free = atomic>; + # endif // !_LIBCPP_NO_LOCK_FREE_TYPES + #endif // C++20 +#endif +#undef NO_LOCK_FREE