From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 1 Jan 2023 14:46:39 +0000 (+0000)
Subject: libcxx-armhf-ftbfs
X-Git-Tag: archive/raspbian/1%15.0.6-4+rpi1^2~45
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c28827b9b0411c0969195783b5572d7a0f6098bb;p=llvm-toolchain-15.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 3a93b9b0a1..97bec3d656 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -2659,9 +2659,13 @@ typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned c
 #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}