From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 4 May 2024 05:30:47 +0000 (+0200)
Subject: libcxx-armhf-ftbfs
X-Git-Tag: archive/raspbian/1%18.1.8-12+rpi1~1^2~46
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a5210138b1c9207d0d74000062116206e10ad72;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 e2f9fae409..566476bf85 100644
--- a/libcxx/include/__atomic/aliases.h
+++ b/libcxx/include/__atomic/aliases.h
@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE
 #endif
 
 #if !defined(_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
+#endif
+#undef NO_LOCK_FREE
 
 _LIBCPP_END_NAMESPACE_STD