diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-01-17 20:20:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-01-17 20:20:00 +0000 |
| commit | 4c533566c2bb94162bcc1f66c5cf9db609e20803 (patch) | |
| tree | eb3d31e6a55056dc285e43b4700dccded4b88771 /elf/dl-close.c | |
| parent | a0f6c236e068b4fa2d1116cdf7d31b2c2722ab6c (diff) | |
| download | glibc-4c533566c2bb94162bcc1f66c5cf9db609e20803.tar.gz glibc-4c533566c2bb94162bcc1f66c5cf9db609e20803.tar.xz glibc-4c533566c2bb94162bcc1f66c5cf9db609e20803.zip | |
* include/link.h (FORCED_DYNAMIC_TLS_OFFSET): Define.
* elf/dl-close.c (_dl_close): Check for it. * elf/dl-reloc.c (CHECK_STATIC_TLS): Likewise. (_dl_allocate_static_tls): Likewise. * elf/dl-tls.c (_dl_allocate_tls_init): Likewise. (__tls_get_addr): Protect from race conditions in setting l_tls_offset to it. * elf/tst-tls16.c: New file. * elf/tst-tlsmod16a.c: New file. * elf/tst-tlsmod16b.c: New file. * elf/Makefile: Add rules to build and run tst-tls16.
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 264e13a8ee..46f1a40adc 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -531,7 +531,8 @@ _dl_close_worker (struct link_map *map) /* All dynamically loaded modules with TLS are unloaded. */ GL(dl_tls_max_dtv_idx) = GL(dl_tls_static_nelem); - if (imap->l_tls_offset != NO_TLS_OFFSET) + if (imap->l_tls_offset != NO_TLS_OFFSET + && imap->l_tls_offset != FORCED_DYNAMIC_TLS_OFFSET) { /* Collect a contiguous chunk built from the objects in this search list, going in either direction. When the |