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 d0d682da62382cfc0571027499df2e01f37e5b32..d5742bbe3f810748fe78f057b0d69852893ac5d3 100644 (file)
--- 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}