[llvm-branch-commits] [libcxx] r369639 - Merging r369537:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 22 03:32:01 2019
New Revision: 369639

URL: http://llvm.org/viewvc/llvm-project?rev=369639&view=rev
Log:
Merging r369537:
------------------------------------------------------------------------
r369537 | davidspickett | 2019-08-21 17:38:24 +0200 (Wed, 21 Aug 2019) | 7 lines

[libcxx] Only declare contents of threading API when
_LIBCPP_HAS_THREAD_API_EXTERNAL is not defined.

When it is defined they will be declared by the
__external_threading header instead.

Differential revision: https://reviews.llvm.org/D66518
------------------------------------------------------------------------

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

Propchange: libcxx/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 22 03:32:01 2019
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:366868,368867,368916,369399
+/libcxx/trunk:366868,368867,368916,369399,369537

Modified: libcxx/branches/release_90/include/__threading_support
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_90/include/__threading_support?rev=369639&r1=369638&r2=369639&view=diff
==============================================================================
--- libcxx/branches/release_90/include/__threading_support (original)
+++ libcxx/branches/release_90/include/__threading_support Thu Aug 22 03:32:01 2019
@@ -79,7 +79,7 @@ typedef pthread_t __libcpp_thread_t;
 typedef pthread_key_t __libcpp_tls_key;
 
 #define _LIBCPP_TLS_DESTRUCTOR_CC
-#else
+#elif !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 // Mutex
 typedef void* __libcpp_mutex_t;
 #define _LIBCPP_MUTEX_INITIALIZER 0
@@ -112,8 +112,9 @@ typedef void* __libcpp_thread_t;
 typedef long __libcpp_tls_key;
 
 #define _LIBCPP_TLS_DESTRUCTOR_CC __stdcall
-#endif // defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
+#endif // !defined(_LIBCPP_HAS_THREAD_API_PTHREAD) && !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 
+#if !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 // Mutex
 _LIBCPP_THREAD_ABI_VISIBILITY
 int __libcpp_recursive_mutex_init(__libcpp_recursive_mutex_t *__m);
@@ -208,6 +209,8 @@ void *__libcpp_tls_get(__libcpp_tls_key
 _LIBCPP_THREAD_ABI_VISIBILITY
 int __libcpp_tls_set(__libcpp_tls_key __key, void *__p);
 
+#endif // !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
+
 #if (!defined(_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL) || \
      defined(_LIBCPP_BUILDING_THREAD_LIBRARY_EXTERNAL)) && \
     defined(_LIBCPP_HAS_THREAD_API_PTHREAD)