diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-03 04:46:40 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-03 04:46:40 +0000 |
| commit | 710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a (patch) | |
| tree | ce514b2cae73e161177b1a390c7c4118efcff0b0 /elf/dl-reloc.c | |
| parent | 6c03c2cf27b1a12cbf680377e4796b88a20ed9db (diff) | |
| download | glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar.gz | |
Mon Jun 3 00:30:35 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* elf/dl-lookup.c (_dl_lookup_symbol): Take new arg RELOC_ADDR and
don't allow a defn resolving to that address.
* elf/link.h: Update prototype and comment.
* elf/dl-runtime.c (fixup): Define local `resolve' function and pass
it to elf_machine_relplt.
* elf/dl-reloc.c (_dl_relocate_object: resolve): Take new arg
RELOC_ADDR and pass it through to _dl_lookup_symbol.
* elf/do-rel.h (elf_dynamic_do_rel): Pass RESOLVE to elf_machine_rel
instead of calling it ourselves and passing its results.
(elf_dynamic_do_rel): RESOLVE fn takes new arg RELOC_ADDR.
* elf/rtld.c (dl_main): Pass 0 for RELOC_ADDR to _dl_lookup_symbol.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Remove SYM_LOADADDR
arg. Add RESOLVE function ptr arg. Call *RESOLVE as necessary.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/stub/dl-machine.h: Likewise.
* csu/initfini.c (_fini): Add extern decl for i_am_not_a_leaf.
* elf/dlfcn.h (dl_open_mode): Enumerated type removed.
(RTLD_LAZY, RTLD_NOW): Define these as macros instead.
(RTLD_GLOBAL): New macro.
(dlopen): Take arg of type int instead of dl_open_mode.
* elf/dlopen.c: Likewise.
* math/math.h (_Mldbl): New macro, either produces L suffix or not.
(M_*): Use it for these constants.
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 46fc4c4def..424d303800 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -60,10 +60,11 @@ _dl_relocate_object (struct link_map *l, int lazy) = ((void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr); - Elf32_Addr resolve (const Elf32_Sym **ref, int noplt) + Elf32_Addr resolve (const Elf32_Sym **ref, + Elf32_Addr reloc_addr, int noplt) { return _dl_lookup_symbol (strtab + (*ref)->st_name, ref, scope, - l->l_name, noplt); + l->l_name, reloc_addr, noplt); } real_next = l->l_next; |