diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
commit | 928ab832caa67c0c1a44e3a8e1483b0ed33cda50 (patch) | |
tree | 6e3df2d0437f834971fe28bdf519a2c8da694fc1 /ldso/ldso/dl-tls.c | |
parent | 74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff) | |
parent | f1f98784e65ce9621a570af50998b1940e7fb81d (diff) |
merge uClibc changes
Diffstat (limited to 'ldso/ldso/dl-tls.c')
-rw-r--r-- | ldso/ldso/dl-tls.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c index 5d6d3b9d3..ced20fa2b 100644 --- a/ldso/ldso/dl-tls.c +++ b/ldso/ldso/dl-tls.c @@ -963,8 +963,13 @@ static bool tls_init_tp_called; void ** __attribute__ ((const)) _dl_initial_error_catch_tsd (void) { - static void *data; - return &data; + static +#if 0 /* def ARCH_NEEDS_BOOTSTRAP_RELOCS */ + /* If we have to do bootstrap relocs anyway we might as well */ + __thread +# endif + void *__tsd_data; + return &__tsd_data; } #ifdef SHARED |