Also relocate in dependency order when doing symbol dependency testing
This commit is contained in:
parent
1ae12c758f
commit
48b67d71ec
|
@ -1,3 +1,8 @@
|
||||||
|
2011-09-14 Andreas Schwab <schwab@redhat.com>
|
||||||
|
|
||||||
|
* elf/rtld.c (dl_main): Also relocate in dependency order when
|
||||||
|
doing symbol dependency testing.
|
||||||
|
|
||||||
2011-09-13 Andreas Schwab <schwab@linux-m68k.org>
|
2011-09-13 Andreas Schwab <schwab@linux-m68k.org>
|
||||||
|
|
||||||
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
|
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
|
||||||
|
|
11
elf/rtld.c
11
elf/rtld.c
|
@ -2027,24 +2027,21 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||||
{
|
{
|
||||||
/* We have to do symbol dependency testing. */
|
/* We have to do symbol dependency testing. */
|
||||||
struct relocate_args args;
|
struct relocate_args args;
|
||||||
struct link_map *l;
|
unsigned int i;
|
||||||
|
|
||||||
args.reloc_mode = GLRO(dl_lazy) ? RTLD_LAZY : 0;
|
args.reloc_mode = GLRO(dl_lazy) ? RTLD_LAZY : 0;
|
||||||
|
|
||||||
l = main_map;
|
i = main_map->l_searchlist.r_nlist;
|
||||||
while (l->l_next != NULL)
|
while (i-- > 0)
|
||||||
l = l->l_next;
|
|
||||||
do
|
|
||||||
{
|
{
|
||||||
|
struct link_map *l = main_map->l_initfini[i];
|
||||||
if (l != &GL(dl_rtld_map) && ! l->l_faked)
|
if (l != &GL(dl_rtld_map) && ! l->l_faked)
|
||||||
{
|
{
|
||||||
args.l = l;
|
args.l = l;
|
||||||
_dl_receive_error (print_unresolved, relocate_doit,
|
_dl_receive_error (print_unresolved, relocate_doit,
|
||||||
&args);
|
&args);
|
||||||
}
|
}
|
||||||
l = l->l_prev;
|
|
||||||
}
|
}
|
||||||
while (l != NULL);
|
|
||||||
|
|
||||||
if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
|
if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
|
||||||
&& rtld_multiple_ref)
|
&& rtld_multiple_ref)
|
||||||
|
|
Loading…
Reference in New Issue