diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-04-18 21:37:30 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-04-22 19:59:09 +0200 |
| commit | 7c78a5c52b2db6bb0d6e163b38897a003a289958 (patch) | |
| tree | cb581c1f91c584c9f7a4be0aa08ab7cf077a5972 /ldso | |
| parent | 8e04c064c4cb39bae5e5bec166c762d2fc88cb11 (diff) | |
NPTL: Rename a variable
There seems to be a bug in gold with static TLS at least on x86_64 (?)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/ldsodefs.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/dl-tls.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ldso/include/ldsodefs.h b/ldso/include/ldsodefs.h index 4063d00f4..0feed8954 100644 --- a/ldso/include/ldsodefs.h +++ b/ldso/include/ldsodefs.h @@ -106,7 +106,9 @@ EXTERN size_t _dl_tls_static_used; /* Alignment requirement of the static TLS block. */ EXTERN size_t _dl_tls_static_align; /* Function pointer for catching TLS errors. */ +#if 1 /* def _LIBC_REENTRANT */ EXTERN void **(*_dl_error_catch_tsd) (void) __attribute__ ((const)); +#endif /* Number of additional entries in the slotinfo array of each slotinfo list element. A large number makes it almost certain take we never diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c index 6679693f4..05193a893 100644 --- a/ldso/ldso/dl-tls.c +++ b/ldso/ldso/dl-tls.c @@ -950,8 +950,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 |