[llvm-branch-commits] [libcxx] r369498 - Merging r369399:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Aug 21 00:27:19 2019
New Revision: 369498

URL: http://llvm.org/viewvc/llvm-project?rev=369498&view=rev
Log:
Merging r369399:
------------------------------------------------------------------------
r369399 | marshall | 2019-08-20 18:16:23 +0200 (Tue, 20 Aug 2019) | 1 line

Fix availability of __thread_id on builds with external threading. Reviewed as https://reviews.llvm.org/D66480
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_90/   (props changed)
    libcxx/branches/release_90/include/__threading_support

Propchange: libcxx/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 21 00:27:19 2019
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:366868,368867,368916
+/libcxx/trunk:366868,368867,368916,369399

Modified: libcxx/branches/release_90/include/__threading_support
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_90/include/__threading_support?rev=369498&r1=369497&r2=369498&view=diff
==============================================================================
--- libcxx/branches/release_90/include/__threading_support (original)
+++ libcxx/branches/release_90/include/__threading_support Wed Aug 21 00:27:19 2019
@@ -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