From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 5 Apr 2025 20:24:44 +0000 (+0200)
Subject: libcxx-armhf-ftbfs
X-Git-Tag: archive/raspbian/1%18.1.8-18+rpi1^2~52
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ceb50253a5018822c461b0313c50e29493bf9e02;p=llvm-toolchain-18.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 0fa289de54..c49e480855 100644
--- a/libcxx/include/__atomic/aliases.h
+++ b/libcxx/include/__atomic/aliases.h
@@ -96,6 +96,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,
@@ -105,6 +106,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