diff options
| author | Roland McGrath <roland@gnu.org> | 2002-12-04 12:30:40 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-12-04 12:30:40 +0000 |
| commit | 216455bc284f57dbaf939059f815935e23456c02 (patch) | |
| tree | 3ae488a18ace0ebe18d7923eae29ae65a3badada /elf/dl-tsd.c | |
| parent | 68dc80ca28a192d686b3190373df8468b4ce5cb8 (diff) | |
| download | glibc-216455bc284f57dbaf939059f815935e23456c02.tar.gz glibc-216455bc284f57dbaf939059f815935e23456c02.tar.xz glibc-216455bc284f57dbaf939059f815935e23456c02.zip | |
* sysdeps/generic/ldsodefs.h (struct rtld_global): Move all [USE_TLS]
members to the end, so a libpthread compiled with !USE_TLS will still find other members properly. * sysdeps/i386/i486/bits/string.h (__strcpy_g): Add dummy output operand for DEST memory. Fix dummy input operand to use SRC. Reported by Davin McCall <davmac@ozonline.com.au>. * sysdeps/generic/libc-tls.c (__libc_setup_tls): Account for TCB alignment when initializing the DTV entry. * elf/dl-load.c (_dl_map_object_from_fd): If we hit a TLS segment when TLS has not been set up, try to set it up if we can. * elf/tst-tls4.c: Revert last change. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * sysdeps/generic/dl-tls.c [SHARED] (_dl_tls_setup): New function. * sysdeps/generic/ldsodefs.h: Declare it. * elf/Versions (ld: GLIBC_PRIVATE): Add it. * sysdeps/generic/libc-tls.c (init_slotinfo): New static inline function, broken out of __libc_setup_tls. (init_static_tls): Likewise. (__libc_setup_tls): Call them. (_dl_tls_setup): New function, uses new subroutines. * elf/dl-close.c (free_slotinfo): Make argument pointer to pointer. Clear the pointer when returning true. (libc_freeres_fn) [SHARED]: If GL(dl_initial_dtv) is null, free the first element of the slotinfo list too. * sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Define only if [SHARED]. * sysdeps/generic/ldsodefs.h (_dl_next_tls_modid): Declare as hidden. (_dl_determine_tlsoffset): Likewise. * elf/rtld.c (_dl_initial_error_catch_tsd): Renamed from startup_error_tsd, made global. (dl_main): Update initialization. * elf/dl-tsd.c: Likewise. * sysdeps/generic/ldsodefs.h: Declare it.
Diffstat (limited to 'elf/dl-tsd.c')
| -rw-r--r-- | elf/dl-tsd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-tsd.c b/elf/dl-tsd.c index c60cd1a760..f44fa7d365 100644 --- a/elf/dl-tsd.c +++ b/elf/dl-tsd.c @@ -27,8 +27,8 @@ /* _dl_error_catch_tsd points to this for the single-threaded case. It's reset by the thread library for multithreaded programs if we're not using __thread. */ -static void ** __attribute__ ((const)) -startup_error_tsd (void) +void ** __attribute__ ((const)) +_dl_initial_error_catch_tsd (void) { # if USE___THREAD static __thread void *data; @@ -38,7 +38,7 @@ startup_error_tsd (void) return &data; } void **(*_dl_error_catch_tsd) (void) __attribute__ ((const)) - = &startup_error_tsd; + = &_dl_initial_error_catch_tsd; # elif USE___THREAD |