#ifdef CONFIG_RCU_TLS
-#if defined (__cplusplus) && __cplusplus >= 201103L
-# 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)
+/*
+ * 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(_MSC_VER)
# define URCU_TLS_STORAGE_CLASS __declspec(thread)
#else
# define URCU_TLS_STORAGE_CLASS __thread
type *__tls_access_ ## name(void) \
{ \
static struct urcu_tls __tls_ ## name = { \
+ .key = 0, \
.init_mutex = PTHREAD_MUTEX_INITIALIZER,\
.init_done = 0, \
}; \
pthread_mutex_unlock(&__tls_ ## name.init_mutex); \
} \
cmm_smp_rmb(); /* read init_done before getting key */ \
- __tls_p = pthread_getspecific(__tls_ ## name.key); \
+ __tls_p = (__typeof__(type) *) pthread_getspecific(__tls_ ## name.key); \
if (caa_unlikely(__tls_p == NULL)) { \
- __tls_p = calloc(1, sizeof(type)); \
+ __tls_p = (__typeof__(type) *) calloc(1, sizeof(type)); \
do_init \
(void) pthread_setspecific(__tls_ ## name.key, \
__tls_p); \