diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-04-26 15:33:29 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-05-08 19:37:29 -0700 |
| commit | 06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76 (patch) | |
| tree | 1316711b92a43dd5c599e425b8693fa8e1e0c0b7 /lib/libcxx/src/shared_mutex.cpp | |
| parent | bc6ebc6f2597fda1f98842c6f545751fef2a5334 (diff) | |
| download | zig-06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76.tar.gz zig-06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76.zip | |
libcxx: update to LLVM 18
release/18.x branch, commit 78b99c73ee4b96fe9ce0e294d4632326afb2db42
This adds the flag `-D_LIBCPP_HARDENING_MODE` which is determined based
on the Zig optimization mode.
This commit also fixes libunwind, libcxx, and libcxxabi to properly
report sub compilation errors.
Diffstat (limited to 'lib/libcxx/src/shared_mutex.cpp')
| -rw-r--r-- | lib/libcxx/src/shared_mutex.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/libcxx/src/shared_mutex.cpp b/lib/libcxx/src/shared_mutex.cpp index 49a51e0271..1a346dda02 100644 --- a/lib/libcxx/src/shared_mutex.cpp +++ b/lib/libcxx/src/shared_mutex.cpp @@ -6,15 +6,11 @@ // //===----------------------------------------------------------------------===// -#include <__config> - -#ifndef _LIBCPP_HAS_NO_THREADS - -# include <mutex> -# include <shared_mutex> -# if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB) -# pragma comment(lib, "pthread") -# endif +#include <mutex> +#include <shared_mutex> +#if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB) +# pragma comment(lib, "pthread") +#endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -95,5 +91,3 @@ bool shared_timed_mutex::try_lock_shared() { return __base_.try_lock_shared(); } void shared_timed_mutex::unlock_shared() { return __base_.unlock_shared(); } _LIBCPP_END_NAMESPACE_STD - -#endif // !_LIBCPP_HAS_NO_THREADS |