Merge pull request #1883 from zao/clang-thread_local

Add feature test for thread_local on Clang for TLS
STEllAR-GROUP · Dec 3, 2015 · 7c70f2a · 7c70f2a
2 parents 1579364 + eb19038
commit 7c70f2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/hpx/util/thread_specific_ptr.hpp b/hpx/util/thread_specific_ptr.hpp
@@ -25,7 +25,9 @@
 
 #if (!defined(__ANDROID__) && !defined(ANDROID)) && !defined(__bgq__)
 
-#if defined(_GLIBCXX_HAVE_TLS)
+#if defined(__has_feature) && __has_feature(cxx_thread_local)
+#  define HPX_NATIVE_TLS thread_local
+#elif defined(_GLIBCXX_HAVE_TLS)
 #  define HPX_NATIVE_TLS __thread
 #elif defined(BOOST_WINDOWS)
 #  define HPX_NATIVE_TLS __declspec(thread)

diff --git a/tests/performance/local/native_tls_overhead.cpp b/tests/performance/local/native_tls_overhead.cpp
@@ -17,7 +17,9 @@
 
 #include <hpx/util/high_resolution_timer.hpp>
 
-#if defined(_GLIBCXX_HAVE_TLS)
+#if defined(__has_feature) && __has_feature(cxx_thread_local)
+    #define HPX_NATIVE_TLS thread_local
+#elif defined(_GLIBCXX_HAVE_TLS)
     #define HPX_NATIVE_TLS __thread
 #elif defined(BOOST_WINDOWS)
     #define HPX_NATIVE_TLS __declspec(thread)