From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Fri, 14 Mar 2025 09:48:31 +0000 (+0100)
Subject: libcxx-armhf-ftbfs
X-Git-Tag: archive/raspbian/1%19.1.7-3+rpi1^2~49
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c050fe5cec69158c7054e698ba943f8bd219282;p=llvm-toolchain-19.git

libcxx-armhf-ftbfs

===================================================================

Gbp-Pq: Topic libcxx
Gbp-Pq: Name libcxx-armhf-ftbfs.diff
---

diff --git a/libcxx/include/__atomic/aliases.h b/libcxx/include/__atomic/aliases.h
index e27e09af6b..3204f7bbf7 100644
--- a/libcxx/include/__atomic/aliases.h
+++ b/libcxx/include/__atomic/aliases.h
@@ -95,6 +95,7 @@ using __largest_lock_free_type = char;
 #  endif
 
 #  ifndef _LIBCPP_NO_LOCK_FREE_TYPES
+#ifndef NO_LOCK_FREE
 using __contention_t_or_largest =
     __conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value,
                     __cxx_contention_t,
@@ -104,6 +105,8 @@ using atomic_signed_lock_free   = atomic<__contention_t_or_largest>;
 using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_largest>>;
 #  endif // !_LIBCPP_NO_LOCK_FREE_TYPES
 #endif   // C++20
+#endif
+#undef NO_LOCK_FREE
 
 _LIBCPP_END_NAMESPACE_STD