From f5433cbb4d6b2cb57aa5dfd99f3c589fd192f3ea Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Feb 2023 17:15:27 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff index 6cfadcf6..46d63e30 100644 --- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff @@ -1,17 +1,16 @@ -Index: llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h +Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec.orig/libcxx/include/__atomic/aliases.h -+++ llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h -@@ -106,9 +106,13 @@ typedef __conditional_t<_LIBCPP_CONTENTI +--- 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 #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) +#ifndef NO_LOCK_FREE - typedef atomic<__libcpp_signed_lock_free> atomic_signed_lock_free; - typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free; + using atomic_signed_lock_free = atomic<__libcpp_signed_lock_free>; + using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>; #endif +#endif -+ +#undef NO_LOCK_FREE _LIBCPP_END_NAMESPACE_STD