rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-02-22 17:15:27 +01:00
parent 14540c15e0
commit f5433cbb4d

View File

@ -1,17 +1,16 @@
Index: llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h
===================================================================
--- llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec.orig/libcxx/include/__atomic/aliases.h
+++ llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
@@ -106,9 +106,13 @@ typedef __conditional_t<_LIBCPP_CONTENTI
--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h
+++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h
@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co
#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;
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