diff options
| author | Keith Packard <keithp@keithp.com> | 2011-04-27 12:01:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-04-27 12:01:56 -0700 |
| commit | ec9ea4017885cefe5519a4e890b0ff1a5518235a (patch) | |
| tree | 7cc36fe3998133adf8417a2479c0853e1a0f08ac /glx | |
| parent | c6cb70be1ed7cf73bd3411b8d66ec05a9efcfeb9 (diff) | |
| parent | 6f29dbf5e36bef5ecb08f02d367988dee0f9f1cd (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
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 |