Mesa (main): glx: __glX_tls_Context should use __THREAD_INITIAL_EXEC

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7d35d560aca3af567974121c1612b1a3eaeb7419
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d35d560aca3af567974121c1612b1a3eaeb7419

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Thu Jul 28 16:23:37 2022 +0800

glx: __glX_tls_Context should use __THREAD_INITIAL_EXEC

Error message on OSX:
../src/glx/tests/fake_glx_screen.cpp:101:20: error: thread-local declaration of '__glX_tls_Context' with dynamic initialization follows declaration with static initialization
thread_local void *__glX_tls_Context = &dummyContext;
                   ^
../src/glx/glxclient.h:655:36: note: previous declaration is here
extern __THREAD_INITIAL_EXEC void *__glX_tls_Context;

Fixes: be00a7c8acf ("glx: using C++11 keyword thread_local")

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Eric Engestrom <eric at igalia.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>

---

 src/glx/tests/fake_glx_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glx/tests/fake_glx_screen.cpp b/src/glx/tests/fake_glx_screen.cpp
index 46e94d79fa1..9ccbd64f23b 100644
--- a/src/glx/tests/fake_glx_screen.cpp
+++ b/src/glx/tests/fake_glx_screen.cpp
@@ -98,7 +98,7 @@ struct glx_context dummyContext = {
    sizeof(dummyBuffer),
    &dummyVtable
 };
-thread_local void *__glX_tls_Context = &dummyContext;
+__THREAD_INITIAL_EXEC void *__glX_tls_Context = &dummyContext;
 
 #if !defined(USE_ELF_TLS)
 extern "C" struct glx_context *