From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 14 Oct 2023 16:37:48 +0000 (+0100)
Subject: libcxx-armhf-ftbfs
X-Git-Tag: archive/raspbian/1%19.1.3-1+rpi1~2^2^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b22757377c6eb8844994de265bb614ac3e32bab;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 b/libcxx/include/atomic
index d0d682da62..d5742bbe3f 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -2649,9 +2649,13 @@ typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsign
 #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;
 #endif
+#endif
+
+#undef NO_LOCK_FREE
 
 #define ATOMIC_FLAG_INIT {false}
 #define ATOMIC_VAR_INIT(__v) {__v}