<div dir="ltr">Asiri,<div><br></div><div>The boot strap build has started to fail for. Your change seems to be related, right?</div><div><br></div><div><div>[14/22] Building CXX object projects/libcxx/lib/CMakeFiles/cxx_objects.dir/__/src/locale.cpp.o</div><div>FAILED: /usr/bin/g++ -D_DEBUG -D_GNU_SOURCE -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Iprojects/libcxx/lib -I/usr/local/google/home/aizatsky/</div><div>src/llvm/projects/libcxx/lib -Iinclude -I/usr/local/google/home/aizatsky/src/llvm/include -I/usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unuse</div><div>d-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -std=c++11 -ffunction-sections -fdata-sections -O3 -UN</div><div>DEBUG -DLIBCXX_BUILDING_LIBCXXABI -std=c++11 -nostdinc++ -Wall -Wextra -W -Wwrite-strings -Wno-unused-parameter -Wno-long-long -Werror=return-type -Wno-attributes -Wno-literal-suffix -Wno-c++14-compat -Wno-erro</div><div>r -fPIC -MMD -MT projects/libcxx/lib/CMakeFiles/cxx_objects.dir/__/src/locale.cpp.o -MF projects/libcxx/lib/CMakeFiles/cxx_objects.dir/__/src/locale.cpp.o.d -o projects/libcxx/lib/CMakeFiles/cxx_objects.dir/__/</div><div>src/locale.cpp.o -c /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/src/locale.cpp</div><div>In file included from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/__mutex_base:17:0,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/mutex:189,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/__locale:18,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/locale:182,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/src/locale.cpp:17:</div><div>/usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/__threading_support:22:90: error: missing binary operator before token "("</div><div> #if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) && (!defined(__has_include) || __has_include(<__external_threading>))</div><div> ^</div><div>In file included from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/algorithm:637:0,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/__string:55,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/string_view:166,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/include/string:464,</div><div> from /usr/local/google/home/aizatsky/src/llvm/projects/libcxx/src/locale.cpp:16:</div></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr">On Sun, Sep 11, 2016 at 2:55 PM Asiri Rathnayake via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: asiri<br class="gmail_msg">
Date: Sun Sep 11 16:46:40 2016<br class="gmail_msg">
New Revision: 281179<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=281179&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=281179&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[libcxx] Introduce an externally-threaded libc++ variant.<br class="gmail_msg">
<br class="gmail_msg">
This patch further decouples libc++ from pthread, allowing libc++ to be built<br class="gmail_msg">
against other threading systems. There are two main use cases:<br class="gmail_msg">
<br class="gmail_msg">
- Building libc++ against a thread library other than pthreads.<br class="gmail_msg">
<br class="gmail_msg">
- Building libc++ with an "external" thread API, allowing a separate library to<br class="gmail_msg">
provide the implementation of that API.<br class="gmail_msg">
<br class="gmail_msg">
The two use cases are quite similar, the second one being sligtly more<br class="gmail_msg">
de-coupled than the first. The cmake option LIBCXX_HAS_EXTERNAL_THREAD_API<br class="gmail_msg">
enables both kinds of builds. One needs to place an <__external_threading><br class="gmail_msg">
header file containing an implementation of the "libc++ thread API" declared<br class="gmail_msg">
in the <__threading_support> header.<br class="gmail_msg">
<br class="gmail_msg">
For the second use case, the implementation of the libc++ thread API can<br class="gmail_msg">
delegate to a custom "external" thread API where the implementation of this<br class="gmail_msg">
external API is provided in a seperate library. This mechanism allows toolchain<br class="gmail_msg">
vendors to distribute a build of libc++ with a custom thread-porting-layer API<br class="gmail_msg">
(which is the "external" API above), platform vendors (recipients of the<br class="gmail_msg">
toolchain/libc++) are then required to provide their implementation of this API<br class="gmail_msg">
to be linked with (end-user) C++ programs.<br class="gmail_msg">
<br class="gmail_msg">
Note that the second use case still requires establishing the basic types that<br class="gmail_msg">
get passed between the external thread library and the libc++ library<br class="gmail_msg">
(e.g. __libcpp_mutex_t). These cannot be opaque pointer types (libc++ sources<br class="gmail_msg">
won't compile otherwise). It should also be noted that the second use case can<br class="gmail_msg">
have a slight performance penalty; as all the thread constructs need to cross a<br class="gmail_msg">
library boundary through an additional function call.<br class="gmail_msg">
<br class="gmail_msg">
When the header <__external_threading> is omitted, libc++ is built with the<br class="gmail_msg">
"libc++ thread API" (declared in <__threading_support>) as the "external" thread<br class="gmail_msg">
API (basic types are pthread based). An implementation (pthread based) of this<br class="gmail_msg">
API is provided in test/support/external_threads.cpp, which is built into a<br class="gmail_msg">
separate DSO and linked in when running the libc++ test suite. A test run<br class="gmail_msg">
therefore demonstrates the second use case (less the intermediate custom API).<br class="gmail_msg">
<br class="gmail_msg">
Differential revision: <a href="https://reviews.llvm.org/D21968" rel="noreferrer" class="gmail_msg" target="_blank">https://reviews.llvm.org/D21968</a><br class="gmail_msg">
<br class="gmail_msg">
Reviewers: bcraig, compnerd, EricWF, mclow.lists<br class="gmail_msg">
<br class="gmail_msg">
Added:<br class="gmail_msg">
libcxx/trunk/test/support/external_threads.cpp<br class="gmail_msg">
- copied, changed from r280988, libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp<br class="gmail_msg">
Modified:<br class="gmail_msg">
libcxx/trunk/CMakeLists.txt<br class="gmail_msg">
libcxx/trunk/include/__config<br class="gmail_msg">
libcxx/trunk/include/__<a href="http://config_site.in" rel="noreferrer" class="gmail_msg" target="_blank">config_site.in</a><br class="gmail_msg">
libcxx/trunk/include/__threading_support<br class="gmail_msg">
libcxx/trunk/include/thread<br class="gmail_msg">
libcxx/trunk/lib/CMakeLists.txt<br class="gmail_msg">
libcxx/trunk/test/CMakeLists.txt<br class="gmail_msg">
libcxx/trunk/test/libcxx/test/config.py<br class="gmail_msg">
libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp<br class="gmail_msg">
libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp<br class="gmail_msg">
libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp<br class="gmail_msg">
libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp<br class="gmail_msg">
libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp<br class="gmail_msg">
libcxx/trunk/test/<a href="http://lit.site.cfg.in" rel="noreferrer" class="gmail_msg" target="_blank">lit.site.cfg.in</a><br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/CMakeLists.txt (original)<br class="gmail_msg">
+++ libcxx/trunk/CMakeLists.txt Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -140,6 +140,9 @@ option(LIBCXX_ENABLE_MONOTONIC_CLOCK<br class="gmail_msg">
This option may only be set to OFF when LIBCXX_ENABLE_THREADS=OFF." ON)<br class="gmail_msg">
option(LIBCXX_HAS_MUSL_LIBC "Build libc++ with support for the Musl C library" OFF)<br class="gmail_msg">
option(LIBCXX_HAS_PTHREAD_API "Ignore auto-detection and force use of pthread API" OFF)<br class="gmail_msg">
+option(LIBCXX_HAS_EXTERNAL_THREAD_API<br class="gmail_msg">
+ "Build libc++ with an externalized threading API.<br class="gmail_msg">
+ This option may only be set to ON when LIBCXX_ENABLE_THREADS=ON." OFF)<br class="gmail_msg">
<br class="gmail_msg">
# Misc options ----------------------------------------------------------------<br class="gmail_msg">
# FIXME: Turn -pedantic back ON. It is currently off because it warns<br class="gmail_msg">
@@ -197,6 +200,11 @@ if(LIBCXX_HAS_PTHREAD_API AND NOT LIBCXX<br class="gmail_msg">
" when LIBCXX_ENABLE_THREADS is also set to ON.")<br class="gmail_msg">
endif()<br class="gmail_msg">
<br class="gmail_msg">
+if(LIBCXX_HAS_EXTERNAL_THREAD_API AND NOT LIBCXX_ENABLE_THREADS)<br class="gmail_msg">
+ message(FATAL_ERROR "LIBCXX_HAS_EXTERNAL_THREAD_API can only be set to ON"<br class="gmail_msg">
+ " when LIBCXX_ENABLE_THREADS is also set to ON.")<br class="gmail_msg">
+endif()<br class="gmail_msg">
+<br class="gmail_msg">
# Ensure LLVM_USE_SANITIZER is not specified when LIBCXX_GENERATE_COVERAGE<br class="gmail_msg">
# is ON.<br class="gmail_msg">
if (LLVM_USE_SANITIZER AND LIBCXX_GENERATE_COVERAGE)<br class="gmail_msg">
@@ -371,6 +379,17 @@ if (NOT LIBCXX_ENABLE_RTTI)<br class="gmail_msg">
add_compile_flags_if_supported(-fno-rtti)<br class="gmail_msg">
endif()<br class="gmail_msg">
<br class="gmail_msg">
+# Threading flags =============================================================<br class="gmail_msg">
+if (LIBCXX_HAS_EXTERNAL_THREAD_API AND LIBCXX_ENABLE_SHARED)<br class="gmail_msg">
+ # Need to allow unresolved symbols if this is to work with shared library builds<br class="gmail_msg">
+ if (APPLE)<br class="gmail_msg">
+ add_link_flags("-undefined dynamic_lookup")<br class="gmail_msg">
+ else()<br class="gmail_msg">
+ # Relax this restriction from HandleLLVMOptions<br class="gmail_msg">
+ string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")<br class="gmail_msg">
+ endif()<br class="gmail_msg">
+endif()<br class="gmail_msg">
+<br class="gmail_msg">
# Assertion flags =============================================================<br class="gmail_msg">
define_if(LIBCXX_ENABLE_ASSERTIONS -UNDEBUG)<br class="gmail_msg">
define_if_not(LIBCXX_ENABLE_ASSERTIONS -DNDEBUG)<br class="gmail_msg">
@@ -432,6 +451,7 @@ config_define_if_not(LIBCXX_ENABLE_MONOT<br class="gmail_msg">
config_define_if_not(LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS)<br class="gmail_msg">
<br class="gmail_msg">
config_define_if(LIBCXX_HAS_PTHREAD_API _LIBCPP_HAS_THREAD_API_PTHREAD)<br class="gmail_msg">
+config_define_if(LIBCXX_HAS_EXTERNAL_THREAD_API _LIBCPP_HAS_THREAD_API_EXTERNAL)<br class="gmail_msg">
config_define_if(LIBCXX_HAS_MUSL_LIBC _LIBCPP_HAS_MUSL_LIBC)<br class="gmail_msg">
<br class="gmail_msg">
if (LIBCXX_NEEDS_SITE_CONFIG)<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/include/__config<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/include/__config (original)<br class="gmail_msg">
+++ libcxx/trunk/include/__config Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -831,7 +831,9 @@ extern "C" void __sanitizer_annotate_con<br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
// Thread API<br class="gmail_msg">
-#if !defined(_LIBCPP_HAS_NO_THREADS) && !defined(_LIBCPP_HAS_THREAD_API_PTHREAD)<br class="gmail_msg">
+#if !defined(_LIBCPP_HAS_NO_THREADS) && \<br class="gmail_msg">
+ !defined(_LIBCPP_HAS_THREAD_API_PTHREAD) && \<br class="gmail_msg">
+ !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)<br class="gmail_msg">
# if defined(__FreeBSD__) || \<br class="gmail_msg">
defined(__NetBSD__) || \<br class="gmail_msg">
defined(__linux__) || \<br class="gmail_msg">
@@ -849,6 +851,11 @@ extern "C" void __sanitizer_annotate_con<br class="gmail_msg">
_LIBCPP_HAS_NO_THREADS is not defined.<br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
+#if defined(_LIBCPP_HAS_NO_THREADS) && defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)<br class="gmail_msg">
+# error _LIBCPP_HAS_EXTERNAL_THREAD_API may not be defined when \<br class="gmail_msg">
+ _LIBCPP_HAS_NO_THREADS is defined.<br class="gmail_msg">
+#endif<br class="gmail_msg">
+<br class="gmail_msg">
#if defined(_LIBCPP_HAS_NO_MONOTONIC_CLOCK) && !defined(_LIBCPP_HAS_NO_THREADS)<br class="gmail_msg">
# error _LIBCPP_HAS_NO_MONOTONIC_CLOCK may only be defined when \<br class="gmail_msg">
_LIBCPP_HAS_NO_THREADS is defined.<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/include/__<a href="http://config_site.in" rel="noreferrer" class="gmail_msg" target="_blank">config_site.in</a><br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config_site.in?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config_site.in?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/include/__<a href="http://config_site.in" rel="noreferrer" class="gmail_msg" target="_blank">config_site.in</a> (original)<br class="gmail_msg">
+++ libcxx/trunk/include/__<a href="http://config_site.in" rel="noreferrer" class="gmail_msg" target="_blank">config_site.in</a> Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -20,5 +20,6 @@<br class="gmail_msg">
#cmakedefine _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS<br class="gmail_msg">
#cmakedefine _LIBCPP_HAS_MUSL_LIBC<br class="gmail_msg">
#cmakedefine _LIBCPP_HAS_THREAD_API_PTHREAD<br class="gmail_msg">
+#cmakedefine _LIBCPP_HAS_THREAD_API_EXTERNAL<br class="gmail_msg">
<br class="gmail_msg">
#endif // _LIBCPP_CONFIG_SITE<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/include/__threading_support<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__threading_support?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__threading_support?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/include/__threading_support (original)<br class="gmail_msg">
+++ libcxx/trunk/include/__threading_support Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -19,20 +19,83 @@<br class="gmail_msg">
<br class="gmail_msg">
#ifndef _LIBCPP_HAS_NO_THREADS<br class="gmail_msg">
<br class="gmail_msg">
-#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)<br class="gmail_msg">
+#if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) && (!defined(__has_include) || __has_include(<__external_threading>))<br class="gmail_msg">
+#include <__external_threading><br class="gmail_msg">
+#else<br class="gmail_msg">
#include <pthread.h><br class="gmail_msg">
#include <sched.h><br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
-_LIBCPP_BEGIN_NAMESPACE_STD<br class="gmail_msg">
+#if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)<br class="gmail_msg">
+#define _LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_FUNC_VIS<br class="gmail_msg">
+#else<br class="gmail_msg">
+#define _LIBCPP_THREAD_ABI_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY<br class="gmail_msg">
+#endif<br class="gmail_msg">
<br class="gmail_msg">
-#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)<br class="gmail_msg">
+_LIBCPP_BEGIN_NAMESPACE_STD<br class="gmail_msg">
<br class="gmail_msg">
// Mutex<br class="gmail_msg">
-#define _LIBCPP_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER<br class="gmail_msg">
typedef pthread_mutex_t __libcpp_mutex_t;<br class="gmail_msg">
+#define _LIBCPP_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER<br class="gmail_msg">
+<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_recursive_mutex_init(__libcpp_mutex_t* __m);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_mutex_lock(__libcpp_mutex_t* __m);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_mutex_trylock(__libcpp_mutex_t* __m);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_mutex_unlock(__libcpp_mutex_t* __m);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_mutex_destroy(__libcpp_mutex_t* __m);<br class="gmail_msg">
+<br class="gmail_msg">
+// Condition variable<br class="gmail_msg">
+typedef pthread_cond_t __libcpp_condvar_t;<br class="gmail_msg">
+#define _LIBCPP_CONDVAR_INITIALIZER PTHREAD_COND_INITIALIZER<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_condvar_signal(__libcpp_condvar_t* __cv);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_condvar_broadcast(__libcpp_condvar_t* __cv);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_condvar_wait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_condvar_timedwait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m, timespec* __ts);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv);<br class="gmail_msg">
+<br class="gmail_msg">
+// Thread id<br class="gmail_msg">
+typedef pthread_t __libcpp_thread_id;<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+bool __libcpp_thread_id_less(__libcpp_thread_id t1, __libcpp_thread_id t2);<br class="gmail_msg">
+<br class="gmail_msg">
+// Thread<br class="gmail_msg">
+typedef pthread_t __libcpp_thread_t;<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_thread_create(__libcpp_thread_t* __t, void* (*__func)(void*), void* __arg);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+__libcpp_thread_id __libcpp_thread_get_current_id();<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+__libcpp_thread_id __libcpp_thread_get_id(const __libcpp_thread_t* __t);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_thread_join(__libcpp_thread_t* __t);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_thread_detach(__libcpp_thread_t* __t);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+void __libcpp_thread_yield();<br class="gmail_msg">
+<br class="gmail_msg">
+// Thread local storage<br class="gmail_msg">
+typedef pthread_key_t __libcpp_tls_key;<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+int __libcpp_tls_create(__libcpp_tls_key* __key, void (*__at_exit)(void*));<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+void* __libcpp_tls_get(__libcpp_tls_key __key);<br class="gmail_msg">
+_LIBCPP_THREAD_ABI_VISIBILITY<br class="gmail_msg">
+void __libcpp_tls_set(__libcpp_tls_key __key, void* __p);<br class="gmail_msg">
+<br class="gmail_msg">
+#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD) || defined(_LIBCPP_BUILDING_EXTERNAL_THREADS)<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_recursive_mutex_init(__libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
pthread_mutexattr_t attr;<br class="gmail_msg">
@@ -59,144 +122,112 @@ int __libcpp_recursive_mutex_init(__libc<br class="gmail_msg">
return 0;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_mutex_lock(__libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_mutex_lock(__m);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_mutex_trylock(__libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_mutex_trylock(__m);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_mutex_unlock(__libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_mutex_unlock(__m);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_mutex_destroy(__libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_mutex_destroy(__m);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
// Condition variable<br class="gmail_msg">
-#define _LIBCPP_CONDVAR_INITIALIZER PTHREAD_COND_INITIALIZER<br class="gmail_msg">
-typedef pthread_cond_t __libcpp_condvar_t;<br class="gmail_msg">
-<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_condvar_signal(__libcpp_condvar_t* __cv)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_cond_signal(__cv);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_condvar_broadcast(__libcpp_condvar_t* __cv)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_cond_broadcast(__cv);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_condvar_wait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_cond_wait(__cv, __m);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_condvar_timedwait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m, timespec* __ts)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_cond_timedwait(__cv, __m, __ts);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_cond_destroy(__cv);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-// Thread id<br class="gmail_msg">
-typedef pthread_t __libcpp_thread_id;<br class="gmail_msg">
-<br class="gmail_msg">
// Returns non-zero if the thread ids are equal, otherwise 0<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_equal(t1, t2) != 0;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
// Returns non-zero if t1 < t2, otherwise 0<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
bool __libcpp_thread_id_less(__libcpp_thread_id t1, __libcpp_thread_id t2)<br class="gmail_msg">
{<br class="gmail_msg">
return t1 < t2;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
// Thread<br class="gmail_msg">
-typedef pthread_t __libcpp_thread_t;<br class="gmail_msg">
-<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_thread_create(__libcpp_thread_t* __t, void* (*__func)(void*), void* __arg)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_create(__t, 0, __func, __arg);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
__libcpp_thread_id __libcpp_thread_get_current_id()<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_self();<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
__libcpp_thread_id __libcpp_thread_get_id(const __libcpp_thread_t* __t)<br class="gmail_msg">
{<br class="gmail_msg">
return *__t;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_thread_join(__libcpp_thread_t* __t)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_join(*__t, 0);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
int __libcpp_thread_detach(__libcpp_thread_t* __t)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_detach(*__t);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
void __libcpp_thread_yield()<br class="gmail_msg">
{<br class="gmail_msg">
sched_yield();<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
// Thread local storage<br class="gmail_msg">
-typedef pthread_key_t __libcpp_tl_key;<br class="gmail_msg">
-<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
-int __libcpp_tl_create(__libcpp_tl_key* __key, void (*__at_exit)(void*))<br class="gmail_msg">
+int __libcpp_tls_create(__libcpp_tls_key* __key, void (*__at_exit)(void*))<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_key_create(__key, __at_exit);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
-void* __libcpp_tl_get(__libcpp_tl_key __key)<br class="gmail_msg">
+void* __libcpp_tls_get(__libcpp_tls_key __key)<br class="gmail_msg">
{<br class="gmail_msg">
return pthread_getspecific(__key);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-inline _LIBCPP_ALWAYS_INLINE<br class="gmail_msg">
-void __libcpp_tl_set(__libcpp_tl_key __key, void* __p)<br class="gmail_msg">
+void __libcpp_tls_set(__libcpp_tls_key __key, void* __p)<br class="gmail_msg">
{<br class="gmail_msg">
pthread_setspecific(__key, __p);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-#else // !_LIBCPP_HAS_THREAD_API_PTHREAD<br class="gmail_msg">
- #error "No thread API selected."<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // _LIBCPP_HAS_THREAD_API_PTHREAD || _LIBCPP_BUILDING_EXTERNAL_THREADS<br class="gmail_msg">
<br class="gmail_msg">
_LIBCPP_END_NAMESPACE_STD<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/include/thread<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/thread?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/thread?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/include/thread (original)<br class="gmail_msg">
+++ libcxx/trunk/include/thread Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -137,7 +137,7 @@ public:<br class="gmail_msg">
template <class _Tp><br class="gmail_msg">
class __thread_specific_ptr<br class="gmail_msg">
{<br class="gmail_msg">
- __libcpp_tl_key __key_;<br class="gmail_msg">
+ __libcpp_tls_key __key_;<br class="gmail_msg">
<br class="gmail_msg">
// Only __thread_local_data() may construct a __thread_specific_ptr<br class="gmail_msg">
// and only with _Tp == __thread_struct.<br class="gmail_msg">
@@ -155,7 +155,7 @@ public:<br class="gmail_msg">
~__thread_specific_ptr();<br class="gmail_msg">
<br class="gmail_msg">
_LIBCPP_INLINE_VISIBILITY<br class="gmail_msg">
- pointer get() const {return static_cast<_Tp*>(__libcpp_tl_get(__key_));}<br class="gmail_msg">
+ pointer get() const {return static_cast<_Tp*>(__libcpp_tls_get(__key_));}<br class="gmail_msg">
_LIBCPP_INLINE_VISIBILITY<br class="gmail_msg">
pointer operator*() const {return *get();}<br class="gmail_msg">
_LIBCPP_INLINE_VISIBILITY<br class="gmail_msg">
@@ -173,7 +173,7 @@ __thread_specific_ptr<_Tp>::__at_thread_<br class="gmail_msg">
template <class _Tp><br class="gmail_msg">
__thread_specific_ptr<_Tp>::__thread_specific_ptr()<br class="gmail_msg">
{<br class="gmail_msg">
- int __ec = __libcpp_tl_create(<br class="gmail_msg">
+ int __ec = __libcpp_tls_create(<br class="gmail_msg">
&__key_,<br class="gmail_msg">
&__thread_specific_ptr::__at_thread_exit);<br class="gmail_msg">
if (__ec)<br class="gmail_msg">
@@ -196,7 +196,7 @@ __thread_specific_ptr<_Tp>::set_pointer(<br class="gmail_msg">
{<br class="gmail_msg">
_LIBCPP_ASSERT(get() == nullptr,<br class="gmail_msg">
"Attempting to overwrite thread local data");<br class="gmail_msg">
- __libcpp_tl_set(__key_, __p);<br class="gmail_msg">
+ __libcpp_tls_set(__key_, __p);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
class _LIBCPP_TYPE_VIS thread;<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/lib/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/lib/CMakeLists.txt (original)<br class="gmail_msg">
+++ libcxx/trunk/lib/CMakeLists.txt Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -201,6 +201,23 @@ if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)<br class="gmail_msg">
)<br class="gmail_msg">
endif()<br class="gmail_msg">
<br class="gmail_msg">
+if (LIBCXX_HAS_EXTERNAL_THREAD_API)<br class="gmail_msg">
+ file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp)<br class="gmail_msg">
+<br class="gmail_msg">
+ if (LIBCXX_ENABLE_SHARED)<br class="gmail_msg">
+ add_library(cxx_external_threads SHARED ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES})<br class="gmail_msg">
+ else()<br class="gmail_msg">
+ add_library(cxx_external_threads STATIC ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES})<br class="gmail_msg">
+ endif()<br class="gmail_msg">
+<br class="gmail_msg">
+ set_target_properties(cxx_external_threads<br class="gmail_msg">
+ PROPERTIES<br class="gmail_msg">
+ LINK_FLAGS "${LIBCXX_LINK_FLAGS}"<br class="gmail_msg">
+ COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"<br class="gmail_msg">
+ OUTPUT_NAME "c++external_threads"<br class="gmail_msg">
+ )<br class="gmail_msg">
+endif()<br class="gmail_msg">
+<br class="gmail_msg">
# Generate a linker script inplace of a libc++.so symlink. Rerun this command<br class="gmail_msg">
# after cxx builds.<br class="gmail_msg">
if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/CMakeLists.txt?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/CMakeLists.txt (original)<br class="gmail_msg">
+++ libcxx/trunk/test/CMakeLists.txt Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -22,6 +22,7 @@ pythonize_bool(LIBCXXABI_ENABLE_SHARED)<br class="gmail_msg">
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)<br class="gmail_msg">
pythonize_bool(LIBCXX_HAS_ATOMIC_LIB)<br class="gmail_msg">
pythonize_bool(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)<br class="gmail_msg">
+pythonize_bool(LIBCXX_HAS_EXTERNAL_THREAD_API)<br class="gmail_msg">
<br class="gmail_msg">
# The tests shouldn't link to any ABI library when it has been linked into<br class="gmail_msg">
# libc++ statically or via a linker script.<br class="gmail_msg">
@@ -52,10 +53,14 @@ if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)<br class="gmail_msg">
set(experimental_dep cxx_experimental)<br class="gmail_msg">
endif()<br class="gmail_msg">
<br class="gmail_msg">
+if (LIBCXX_HAS_EXTERNAL_THREAD_API)<br class="gmail_msg">
+ set(external_threads_dep cxx_external_threads)<br class="gmail_msg">
+endif()<br class="gmail_msg">
+<br class="gmail_msg">
add_lit_testsuite(check-cxx<br class="gmail_msg">
"Running libcxx tests"<br class="gmail_msg">
${CMAKE_CURRENT_BINARY_DIR}<br class="gmail_msg">
- DEPENDS cxx ${experimental_dep})<br class="gmail_msg">
+ DEPENDS cxx ${experimental_dep} ${external_threads_dep})<br class="gmail_msg">
<br class="gmail_msg">
add_custom_target(check-libcxx DEPENDS check-cxx)<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/test/config.py<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/test/config.py (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/test/config.py Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -510,6 +510,10 @@ class Configuration(object):<br class="gmail_msg">
self.cxx.link_flags += [abs_path]<br class="gmail_msg">
else:<br class="gmail_msg">
self.cxx.link_flags += ['-lc++']<br class="gmail_msg">
+ # This needs to come after -lc++ as we want its unresolved thread-api symbols<br class="gmail_msg">
+ # to be picked up from this one.<br class="gmail_msg">
+ if self.get_lit_bool('libcxx_external_thread_api', default=False):<br class="gmail_msg">
+ self.cxx.link_flags += ['-lc++external_threads']<br class="gmail_msg">
<br class="gmail_msg">
def configure_link_flags_abi_library(self):<br class="gmail_msg">
cxx_abi = self.get_lit_conf('cxx_abi', 'libcxxabi')<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -7,7 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
+// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external<br class="gmail_msg">
<br class="gmail_msg">
// <condition_variable><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -7,7 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
+// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external<br class="gmail_msg">
<br class="gmail_msg">
// <mutex><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -7,7 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
+// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external<br class="gmail_msg">
<br class="gmail_msg">
// <mutex><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -7,7 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
+// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external<br class="gmail_msg">
<br class="gmail_msg">
// <thread><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -7,7 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
+// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external<br class="gmail_msg">
<br class="gmail_msg">
// <thread><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: libcxx/trunk/test/<a href="http://lit.site.cfg.in" rel="noreferrer" class="gmail_msg" target="_blank">lit.site.cfg.in</a><br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.site.cfg.in?rev=281179&r1=281178&r2=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.site.cfg.in?rev=281179&r1=281178&r2=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/<a href="http://lit.site.cfg.in" rel="noreferrer" class="gmail_msg" target="_blank">lit.site.cfg.in</a> (original)<br class="gmail_msg">
+++ libcxx/trunk/test/<a href="http://lit.site.cfg.in" rel="noreferrer" class="gmail_msg" target="_blank">lit.site.cfg.in</a> Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -26,6 +26,7 @@ config.has_libatomic = "@LIBC<br class="gmail_msg">
config.use_libatomic = "@LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@"<br class="gmail_msg">
<br class="gmail_msg">
config.libcxxabi_shared = "@LIBCXXABI_ENABLE_SHARED@"<br class="gmail_msg">
+config.libcxx_external_thread_api = "@LIBCXX_HAS_EXTERNAL_THREAD_API@"<br class="gmail_msg">
<br class="gmail_msg">
# Let the main config do the real work.<br class="gmail_msg">
lit_config.load_config(config, "@LIBCXX_SOURCE_DIR@/test/lit.cfg")<br class="gmail_msg">
<br class="gmail_msg">
Copied: libcxx/trunk/test/support/external_threads.cpp (from r280988, libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp)<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/external_threads.cpp?p2=libcxx/trunk/test/support/external_threads.cpp&p1=libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp&r1=280988&r2=281179&rev=281179&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/external_threads.cpp?p2=libcxx/trunk/test/support/external_threads.cpp&p1=libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp&r1=280988&r2=281179&rev=281179&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- libcxx/trunk/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp (original)<br class="gmail_msg">
+++ libcxx/trunk/test/support/external_threads.cpp Sun Sep 11 16:46:40 2016<br class="gmail_msg">
@@ -6,22 +6,5 @@<br class="gmail_msg">
// Source Licenses. See LICENSE.TXT for details.<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
-//<br class="gmail_msg">
-// UNSUPPORTED: libcpp-has-no-threads<br class="gmail_msg">
-<br class="gmail_msg">
-// <mutex><br class="gmail_msg">
-<br class="gmail_msg">
-// class mutex;<br class="gmail_msg">
-<br class="gmail_msg">
-// typedef pthread_mutex_t* native_handle_type;<br class="gmail_msg">
-// native_handle_type native_handle();<br class="gmail_msg">
-<br class="gmail_msg">
-#include <mutex><br class="gmail_msg">
-#include <cassert><br class="gmail_msg">
-<br class="gmail_msg">
-int main()<br class="gmail_msg">
-{<br class="gmail_msg">
- std::mutex m;<br class="gmail_msg">
- pthread_mutex_t* h = m.native_handle();<br class="gmail_msg">
- assert(h);<br class="gmail_msg">
-}<br class="gmail_msg">
+#define _LIBCPP_BUILDING_EXTERNAL_THREADS<br class="gmail_msg">
+#include <__threading_support><br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
cfe-commits mailing list<br class="gmail_msg">
<a href="mailto:cfe-commits@lists.llvm.org" class="gmail_msg" target="_blank">cfe-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="gmail_msg">
</blockquote></div><div dir="ltr">-- <br></div><div data-smartmail="gmail_signature"><div dir="ltr">Mike<br>Sent from phone</div></div>