diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-08-20 16:16:23 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-08-20 16:16:23 +0000 |
| commit | 696630eaf2830526fe90bf05a9235e3bbd692c44 (patch) | |
| tree | a09b06e4f68d49f48f8d9f5327fb3bf88672d276 /libcxx/include | |
| parent | 1c56d3df1956b6025491570f06d01caf1480990b (diff) | |
| download | bcm5719-llvm-696630eaf2830526fe90bf05a9235e3bbd692c44.tar.gz bcm5719-llvm-696630eaf2830526fe90bf05a9235e3bbd692c44.zip | |
Fix availability of __thread_id on builds with external threading. Reviewed as https://reviews.llvm.org/D66480
llvm-svn: 369399
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__threading_support | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support index 0331b7c736d..46ac7d8b362 100644 --- a/libcxx/include/__threading_support +++ b/libcxx/include/__threading_support @@ -23,16 +23,11 @@ # include <__external_threading> #elif !defined(_LIBCPP_HAS_NO_THREADS) -typedef ::timespec __libcpp_timespec_t; - #if defined(_LIBCPP_HAS_THREAD_API_PTHREAD) # include <pthread.h> # include <sched.h> #endif -_LIBCPP_PUSH_MACROS -#include <__undef_macros> - #if defined(_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL) || \ defined(_LIBCPP_BUILDING_THREAD_LIBRARY_EXTERNAL) || \ defined(_LIBCPP_HAS_THREAD_API_WIN32) @@ -47,8 +42,16 @@ _LIBCPP_PUSH_MACROS #define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS #endif +typedef ::timespec __libcpp_timespec_t; +#endif // !defined(_LIBCPP_HAS_NO_THREADS) + +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + _LIBCPP_BEGIN_NAMESPACE_STD +#if !defined(_LIBCPP_HAS_NO_THREADS) + #if defined(_LIBCPP_HAS_THREAD_API_PTHREAD) // Mutex typedef pthread_mutex_t __libcpp_mutex_t; @@ -109,7 +112,7 @@ typedef void* __libcpp_thread_t; typedef long __libcpp_tls_key; #define _LIBCPP_TLS_DESTRUCTOR_CC __stdcall -#endif +#endif // defined(_LIBCPP_HAS_THREAD_API_PTHREAD) // Mutex _LIBCPP_THREAD_ABI_VISIBILITY @@ -475,10 +478,10 @@ get_id() _NOEXCEPT } // this_thread +#endif // !_LIBCPP_HAS_NO_THREADS + _LIBCPP_END_NAMESPACE_STD _LIBCPP_POP_MACROS -#endif // !_LIBCPP_HAS_NO_THREADS - #endif // _LIBCPP_THREADING_SUPPORT |
