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 3a93b9b0a10815715b9414da0b909d42035939a6..97bec3d656153fe9e8d9155bf61a4f1c9ff9b5f1 100644 (file)
--- 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}