diff options
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 82fe809f70..1472c18235 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -191,7 +191,7 @@ _dl_start (void *arg) assert (bootstrap_map.l_tls_blocksize != 0); bootstrap_map.l_tls_initimage_size = phdr[cnt].p_filesz; bootstrap_map.l_tls_initimage = (void *) (bootstrap_map.l_addr - + phdr[cnt].p_offset); + + phdr[cnt].p_vaddr); /* We can now allocate the initial TLS block. This can happen on the stack. We'll get the final memory later when we @@ -1087,13 +1087,10 @@ of this helper program; chances are you did not intend to run this program.\n\ for the thread descriptor. The memory for the TLS block will never be freed. It should be allocated accordingly. The dtv array can be changed if dynamic loading requires it. */ - tcbp = INTUSE(_dl_allocate_tls) (); + tcbp = _dl_allocate_tls_storage (); if (tcbp == NULL) _dl_fatal_printf ("\ cannot allocate TLS data structures for initial thread"); - - /* And finally install it for the main thread. */ - TLS_INIT_TP (tcbp); } #endif @@ -1445,6 +1442,21 @@ cannot allocate TLS data structures for initial thread"); we need it in the memory handling later. */ GL(dl_initial_searchlist) = *GL(dl_main_searchlist); +#ifdef USE_TLS +# ifndef SHARED + if (GL(dl_tls_max_dtv_idx) > 0) +# endif + { + /* Now that we have completed relocation, the initializer data + for the TLS blocks has its final values and we can copy them + into the main thread's TLS area, which we allocated above. */ + _dl_allocate_tls_init (tcbp); + + /* And finally install it for the main thread. */ + TLS_INIT_TP (tcbp); + } +#endif + { /* Initialize _r_debug. */ struct r_debug *r = _dl_debug_initialize (GL(dl_rtld_map).l_addr); |