diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 19 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 3 |
3 files changed, 28 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2002-02-05 Ulrich Drepper <drepper@redhat.com> + + * elf/rtld.c (dl_main): Read PT_TLS entry of the executable. + * sysdeps/generic/ldsodefs.h (struct rtld_global): Add + _dl_tls_module_cnt. + 2002-02-04 Ulrich Drepper <drepper@redhat.com> * elf/rtld.c (_dl_start): Fill TLS values in link map for rtld. diff --git a/elf/rtld.c b/elf/rtld.c index bdd12b4f81..64cb7cb49b 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -708,6 +708,25 @@ of this helper program; chances are you did not intend to run this program.\n\ GL(dl_loaded)->l_map_end = allocend; } break; +#ifdef USE_TLS + case PT_TLS: + /* Note that in the case the dynamic linker we duplicate work + here since we read the PT_TLS entry already in + _dl_start_final. But the result is repeatable so do not + check for this special but unimportant case. */ + GL(dl_loaded)->l_tls_blocksize = ph->p_memsz; + GL(dl_loaded)->l_tls_initimage_size = ph->p_filesz; + GL(dl_loaded)->l_tls_initimage = (void *) (GL(dl_loaded)->l_addr + + ph->p_offset); + /* This is the first element of the initialization image list. + It is created as a circular list so that we can easily + append to it. */ + GL(dl_initimage_list) = GL(dl_loaded)->l_tls_nextimage = GL(dl_loaded); + + /* This image get the ID one. */ + GL(dl_tls_module_cnt) = GL(dl_loaded)->l_tls_modid = 1; + break; +#endif } if (! GL(dl_loaded)->l_map_end) GL(dl_loaded)->l_map_end = ~0; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 4e4fecf712..75f82bdd95 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -292,6 +292,9 @@ struct rtld_global thread-local storage sections. This will be traversed to initialize new TLS blocks. */ EXTERN struct link_map *_dl_initimage_list; + + /* Count the number of modules which define TLS data. */ + EXTERN size_t _dl_tls_module_cnt; #endif /* Name of the shared object to be profiled (if any). */ |