diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-02 21:35:43 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-02 21:35:43 +0000 |
| commit | 6c03c2cf27b1a12cbf680377e4796b88a20ed9db (patch) | |
| tree | b197b18a54a6f15f71e0cd1679f91a25d1d0239f /elf/dl-reloc.c | |
| parent | 9004bc202e5ea7b8eabca183f4e6c6abe573f802 (diff) | |
| download | glibc-6c03c2cf27b1a12cbf680377e4796b88a20ed9db.zip glibc-6c03c2cf27b1a12cbf680377e4796b88a20ed9db.tar.gz glibc-6c03c2cf27b1a12cbf680377e4796b88a20ed9db.tar.bz2 | |
* elf/dl-lookup.c (_dl_lookup_symbol): Arg NOSELF renamed to NOPLT.
Reject SHN_UNDEF defns iff NOPLT is nonzero.
* elf/link.h (_dl_lookup_symbol): Update prototype and comment.
* elf/dl-runtime.c (fixup): Pass 1 to _dl_lookup_symbol for NOPLT.
* elf/dlsym.c (dlsym): Pass 0.
* elf/rtld.c (dl_main): Likewise.
* elf/dl-reloc.c (_dl_relocate_object: resolve): Second arg R_OFFSET
replaced with NOPLT flag. Pass it through to _dl_lookup_symbol.
* elf/do-rel.h (elf_dynamic_do_rel): Update prototype of RESOLVE arg.
Pass `elf_machine_pltrel_p (R->r_type)' result as NOPLT flag value.
* sysdeps/i386/dl-machine.h (elf_machine_pltrel_p): New macro.
* sysdeps/m68k/dl-machine.h (elf_machine_pltrel_p): Likewise.
* sysdeps/stub/dl-machine.h (elf_machine_pltrel_p): Likewise.
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index b7d484d..46fc4c4 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -60,10 +60,10 @@ _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, Elf32_Addr r_offset) + Elf32_Addr resolve (const Elf32_Sym **ref, int noplt) { return _dl_lookup_symbol (strtab + (*ref)->st_name, ref, scope, - l->l_name, (*ref)->st_value == r_offset); + l->l_name, noplt); } real_next = l->l_next; |