X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Ftls-compat.h;fp=include%2Furcu%2Ftls-compat.h;h=a2c94ded9cd9833558bb25d19b9908c6f47a9007;hp=25cf375a23462dc53536c5da2cc4d5206466081b;hb=2e359284497c361e3208501fc70d49b2c54dc4ef;hpb=087bce43020d2b45dab2dd8ecd6b0d6949c626f3

diff --git a/include/urcu/tls-compat.h b/include/urcu/tls-compat.h
index 25cf375..a2c94de 100644
--- a/include/urcu/tls-compat.h
+++ b/include/urcu/tls-compat.h
@@ -35,15 +35,14 @@ extern "C" {
 #ifdef CONFIG_RCU_TLS
 
 /*
- * Don't use C++ 'thread_local' on MacOs, the implementation is incompatible
- * with C and will result in a link error when accessing an extern variable
- * provided by the C library from C++ code.
+ * Default to '__thread' on all C and C++ compilers except MSVC. While C11 has
+ * '_Thread_local' and C++11 has 'thread_local', only '__thread' seems to have
+ * a compatible implementation when linking public extern symbols across
+ * language boundaries.
+ *
+ * For more details, see 'https://gcc.gnu.org/onlinedocs/gcc/Thread-Local.html'.
  */
-#if defined (__cplusplus) && (__cplusplus >= 201103L) && !defined(__APPLE__)
-# define URCU_TLS_STORAGE_CLASS	thread_local
-#elif defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-# define URCU_TLS_STORAGE_CLASS	_Thread_local
-#elif defined (_MSC_VER)
+#if defined(_MSC_VER)
 # define URCU_TLS_STORAGE_CLASS	__declspec(thread)
 #else
 # define URCU_TLS_STORAGE_CLASS	__thread