diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index d0bc5cdda28..8842dad851f 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -79,12 +79,11 @@ struct _glapi_table;
 
 #if defined (USE_ELF_TLS)
 
-#ifdef _MSC_VER
-extern __declspec(thread) struct _glapi_table * _glapi_tls_Dispatch;
-extern __declspec(thread) void * _glapi_tls_Context;
+#if defined(USE_TLS_BEHIND_FUNCTIONS)
+extern __THREAD_INITIAL_EXEC struct _glapi_table * _glapi_tls_Dispatch;
+extern __THREAD_INITIAL_EXEC void * _glapi_tls_Context;
 #else
 _GLAPI_EXPORT extern __THREAD_INITIAL_EXEC struct _glapi_table * _glapi_tls_Dispatch;
-
 _GLAPI_EXPORT extern __THREAD_INITIAL_EXEC void * _glapi_tls_Context;
 #endif