(_dl_map_object_from_fd): Store alignment requirement along with the other info in the link map. Change queueing of init images for double linked list. Use _dl_next_tls_modid to compute l_tls_modid.

This commit is contained in:
Ulrich Drepper 2002-02-07 03:53:17 +00:00
parent fb190a0440
commit a53a253b90
1 changed files with 8 additions and 3 deletions

View File

@ -942,6 +942,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
#ifdef USE_TLS #ifdef USE_TLS
case PT_TLS: case PT_TLS:
l->l_tls_blocksize = ph->p_memsz; l->l_tls_blocksize = ph->p_memsz;
l->l_tls_align = ph->p_align;
l->l_tls_initimage_size = ph->p_filesz; l->l_tls_initimage_size = ph->p_filesz;
/* Since we don't know the load address yet only store the /* Since we don't know the load address yet only store the
offset. We will adjust it later. */ offset. We will adjust it later. */
@ -951,15 +952,19 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
It is created as a circular list so that we can easily It is created as a circular list so that we can easily
append to it. */ append to it. */
if (GL(dl_initimage_list) == NULL) if (GL(dl_initimage_list) == NULL)
GL(dl_initimage_list) = l->l_tls_nextimage = l; GL(dl_initimage_list) = l->l_tls_nextimage = l->l_tls_previmage
= l;
else else
{ {
l->l_tls_nextimage = GL(dl_initimage_list); l->l_tls_nextimage = GL(dl_initimage_list)->l_tls_nextimage;
l->l_tls_nextimage->l_tls_previmage = l;
l->l_tls_previmage = GL(dl_initimage_list);
l->l_tls_previmage->l_tls_nextimage = l;
GL(dl_initimage_list) = l; GL(dl_initimage_list) = l;
} }
/* Assign the next available module ID. */ /* Assign the next available module ID. */
l->l_tls_modid = ++GL(dl_tls_module_cnt); l->l_tls_modid = _dl_next_tls_modid ();
break; break;
#endif #endif
} }