lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-10 05:03:06 +03:00
Code Activity

(elf_dynamic_do_rel): Fix problem with ld.so startup. Explicitly remove lazy part for RTLD_BOOTSTRAP since gcc doesn't do it.

Browse Source
This commit is contained in:
Ulrich Drepper
2001-08-24 18:45:23 +00:00
parent 77c88899c1
commit 43a8054017
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
elf/do-rel.h
View File

@@ -48,6 +48,10 @@ elf_dynamic_do_rel (struct link_map *map,
const ElfW(Rel) *end = (const void *) (reladdr + relsize); const ElfW(Rel) *end = (const void *) (reladdr + relsize);
ElfW(Addr) l_addr = map->l_addr; ElfW(Addr) l_addr = map->l_addr;
#ifndef RTLD_BOOTSTRAP
/* We never bind lazily during ld.so bootstrap. Unfortunately gcc is
not clever enough to see through all the function calls to realize
that. */
if (lazy) if (lazy)
{ {
/* Doing lazy PLT relocations; they need very little info. */ /* Doing lazy PLT relocations; they need very little info. */
@@ -55,17 +59,14 @@ elf_dynamic_do_rel (struct link_map *map,
elf_machine_lazy_rel (map, l_addr, r); elf_machine_lazy_rel (map, l_addr, r);
} }
else else
#endif
{ {
const ElfW(Sym) *const symtab = const ElfW(Sym) *const symtab =
(const void *) D_PTR (map, l_info[DT_SYMTAB]); (const void *) D_PTR (map, l_info[DT_SYMTAB]);
#ifndef RTLD_BOOTSTRAP
ElfW(Word) nrelative = (map->l_info[RELCOUNT_IDX] == NULL ElfW(Word) nrelative = (map->l_info[RELCOUNT_IDX] == NULL
? 0 : map->l_info[RELCOUNT_IDX]->d_un.d_val); ? 0 : map->l_info[RELCOUNT_IDX]->d_un.d_val);
#else
ElfW(Word) nrelative = 0;
#endif
const ElfW(Rel) *relative = r; const ElfW(Rel) *relative = r;
r += nrelative; r = MIN (r + nrelative, end);
#ifndef RTLD_BOOTSTRAP #ifndef RTLD_BOOTSTRAP
/* This is defined in rtld.c, but nowhere in the static libc.a; make /* This is defined in rtld.c, but nowhere in the static libc.a; make