diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-14 11:39:25 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-14 11:39:25 +0000 |
| commit | f51d1dfd35f793488ee32c8226cb8955ed75acbe (patch) | |
| tree | 0a157b3355be9569bd6217a20218e2fedd6f42d7 /elf/do-rel.h | |
| parent | c928de790200bc7a81224377d35a91a6103387de (diff) | |
* elf/dl-reloc.c: Include "dynamic-link.h" at file scope.
* elf/rtld.c: Include <string.h>.
* elf/dynamic-link.h (ELF_DYNAMIC_DO_REL, ELF_DYNAMIC_DO_RELA,
ELF_DYNAMIC_RELOCATE): No longer take RESOLVE argument.
Conditionalize defns on [RESOLVE].
* elf/do-rel.h (elf_dynamic_do_rel): Likewise.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
Instead use RESOLVE macro with same args.
(elf_machine_rel): Conditionalize defn on [RESOLVE].
* elf/dl-reloc.c (RESOLVE): New macro, define before including
"dynamic-link.h". It replaces `resolve' local function.
* elf/dl-runtime.c: Likewise.
* elf/rtld.c: Likewise.
Diffstat (limited to 'elf/do-rel.h')
| -rw-r--r-- | elf/do-rel.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/elf/do-rel.h b/elf/do-rel.h index ebf2e84a64..25da59252f 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -28,17 +28,13 @@ Cambridge, MA 02139, USA. */ /* Perform the relocations in MAP on the running program image as specified - by RELTAG, SZTAG. *RESOLVE is called to resolve symbol values; it - modifies its argument pointer to point to the defining symbol, and - returns the base load address of the defining object. If LAZY is - nonzero, this is the first pass on PLT relocations; they should be set - up to call _dl_runtime_resolve, rather than fully resolved now. */ + by RELTAG, SZTAG. If LAZY is nonzero, this is the first pass on PLT + relocations; they should be set up to call _dl_runtime_resolve, rather + than fully resolved now. */ static inline void elf_dynamic_do_rel (struct link_map *map, int reltag, int sztag, - ElfW(Addr) (*resolve) (const ElfW(Sym) **symbol, - ElfW(Addr) reloc_addr, int noplt), int lazy) { const ElfW(Sym) *const symtab @@ -53,7 +49,7 @@ elf_dynamic_do_rel (struct link_map *map, elf_machine_lazy_rel (map, r); else for (; r < end; ++r) - elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], resolve); + elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)]); } #undef elf_dynamic_do_rel |