lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

2002-09-02 Jakub Jelinek <jakub@redhat.com>

Browse Source 
* elf/rtld.c (dl_main): If prelinking succeeded, mark all objects
        as relocated.
This commit is contained in:
Roland McGrath
2002-09-02 20:19:26 +00:00
parent 14a6e35c54
commit d89ae1d5ef
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-09-02 Jakub Jelinek <jakub@redhat.com>
* elf/rtld.c (dl_main): If prelinking succeeded, mark all objects
as relocated.
2002-09-02 Jack Howarth <howarth@bromo.msbb.uc.edu> 2002-09-02 Jack Howarth <howarth@bromo.msbb.uc.edu>
* sysdeps/powerpc/fpu/libm-test-ulps: Regenerated. * sysdeps/powerpc/fpu/libm-test-ulps: Regenerated.

13
elf/rtld.c
View File

@ -1405,6 +1405,8 @@ cannot allocate TLS data structures for initial thread");
if (prelinked) if (prelinked)
{ {
struct link_map *l;
if (GL(dl_loaded)->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) if (GL(dl_loaded)->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
{ {
ElfW(Rela) *conflict, *conflictend; ElfW(Rela) *conflict, *conflictend;
@ -1416,15 +1418,20 @@ cannot allocate TLS data structures for initial thread");
HP_TIMING_NOW (start); HP_TIMING_NOW (start);
assert (GL(dl_loaded)->l_info [VALIDX (DT_GNU_CONFLICTSZ)] != NULL); assert (GL(dl_loaded)->l_info [VALIDX (DT_GNU_CONFLICTSZ)] != NULL);
conflict = (ElfW(Rela) *) conflict = (ElfW(Rela) *)
GL(dl_loaded)->l_info [ADDRIDX (DT_GNU_CONFLICT)]->d_un.d_ptr; GL(dl_loaded)->l_info [ADDRIDX (DT_GNU_CONFLICT)]->d_un.d_ptr;
conflictend = (ElfW(Rela) *) conflictend = (ElfW(Rela) *)
((char *) conflict ((char *) conflict
+ GL(dl_loaded)->l_info [VALIDX (DT_GNU_CONFLICTSZ)]->d_un.d_val); + GL(dl_loaded)->l_info [VALIDX (DT_GNU_CONFLICTSZ)]->d_un.d_val);
_dl_resolve_conflicts (GL(dl_loaded), conflict, conflictend); _dl_resolve_conflicts (GL(dl_loaded), conflict, conflictend);
HP_TIMING_NOW (stop); HP_TIMING_NOW (stop);
HP_TIMING_DIFF (relocate_time, start, stop); HP_TIMING_DIFF (relocate_time, start, stop);
} }
/* Mark all the objects so we know they have been already relocated. */
for (l = GL(dl_loaded); l != NULL; l = l->l_next)
l->l_relocated = 1;
_dl_sysdep_start_cleanup (); _dl_sysdep_start_cleanup ();
} }
else else