diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-23 21:24:27 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-25 18:56:56 -0700 |
| commit | bb4d145bd25e2aee988b100ecf1105ea3b6a40b8 (patch) | |
| tree | cb8ddca62971af33b950dfd35308332f45864a28 /glx | |
| parent | 5c9eafc8e5f8575c06591d244c2cb5ea07691cb4 (diff) | |
glx: Silence warnings when building with clang
This replaces AX_TLS (GPL3) with XORG_TLS (MIT)
In file included from glapi.c:46:
In file included from ./glapi.h:51:
./glthread.h:237:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
In file included from glapi.c:46:
./glapi.h:92:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
glapi.c:82:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec"))) = NULL;
^
glapi.c:85:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
4 errors generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glapi.c | 6 | ||||
| -rw-r--r-- | glx/glapi.h | 3 | ||||
| -rw-r--r-- | glx/glthread.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/glx/glapi.c b/glx/glapi.c index 7cb849535..9e219f680 100644 --- a/glx/glapi.c +++ b/glx/glapi.c @@ -78,11 +78,9 @@ static void init_glapi_relocs(void); /*@{*/ #if defined(GLX_USE_TLS) -PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch - __attribute__((tls_model("initial-exec"))) = NULL; +PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch = NULL; -PUBLIC TLS void * _glapi_tls_Context - __attribute__((tls_model("initial-exec"))); +PUBLIC TLS void * _glapi_tls_Context; PUBLIC const struct _glapi_table *_glapi_Dispatch = NULL; PUBLIC const void *_glapi_Context = NULL; diff --git a/glx/glapi.h b/glx/glapi.h index 6521f3142..7051c1e3c 100644 --- a/glx/glapi.h +++ b/glx/glapi.h @@ -83,8 +83,7 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); const extern void *_glapi_Context; const extern struct _glapi_table *_glapi_Dispatch; -extern TLS void * _glapi_tls_Context - __attribute__((tls_model("initial-exec"))); +extern TLS void * _glapi_tls_Context; # define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) _glapi_tls_Context diff --git a/glx/glthread.h b/glx/glthread.h index 140e2aa8e..532401a73 100644 --- a/glx/glthread.h +++ b/glx/glthread.h @@ -233,8 +233,7 @@ _glthread_SetTSD(_glthread_TSD *, void *); #if defined(GLX_USE_TLS) -extern TLS struct _glapi_table * _glapi_tls_Dispatch - __attribute__((tls_model("initial-exec"))); +extern TLS struct _glapi_table * _glapi_tls_Dispatch; #define GET_DISPATCH() _glapi_tls_Dispatch |