KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: be00a7c8ac ("glx: using C++11 keyword thread_local")

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>
This commit is contained in:
Yonggang Luo 2022-07-28 16:23:37 +08:00 committed by Marge Bot
parent 14bbfee3bc
commit 7d35d560ac
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glx/tests/fake_glx_screen.cpp
View File

@ -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 *