rebase of the patches

This commit is contained in:
Sylvestre Ledru 2023-11-22 22:50:24 +01:00
parent 595804bfd5
commit 1d8b2e734d

View File

@ -1,15 +1,19 @@
Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h --- llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5.orig/libcxx/include/__atomic/aliases.h
+++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h +++ llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h
@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co @@ -96,6 +96,7 @@ using __largest_lock_free_type = char;
# endif # endif
#if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) # ifndef _LIBCPP_NO_LOCK_FREE_TYPES
+#ifndef NO_LOCK_FREE +#ifndef NO_LOCK_FREE
using atomic_signed_lock_free = atomic<__libcpp_signed_lock_free>; using __contention_t_or_largest =
using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>; __conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value,
#endif __cxx_contention_t,
@@ -105,6 +106,8 @@ using atomic_signed_lock_free = atomic
using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_largest>>;
# endif // !_LIBCPP_NO_LOCK_FREE_TYPES
#endif // C++20
+#endif +#endif
+#undef NO_LOCK_FREE +#undef NO_LOCK_FREE