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 e2f9fae4094ef23f778a2296df319e1a192efbb7..566476bf854a1ff74076a1dd942cf9c17b342d18 100644 (file)
--- 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