aboutsummaryrefslogtreecommitdiff
path: root/elf/do-rel.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-03 04:46:40 +0000
committerRoland McGrath <roland@gnu.org>1996-06-03 04:46:40 +0000
commit710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a (patch)
treece514b2cae73e161177b1a390c7c4118efcff0b0 /elf/do-rel.h
parent6c03c2cf27b1a12cbf680377e4796b88a20ed9db (diff)
downloadglibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar
glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar.gz
glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar.bz2
glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.zip
Mon Jun 3 00:30:35 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960603
* 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/do-rel.h')
-rw-r--r--elf/do-rel.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/elf/do-rel.h b/elf/do-rel.h
index a265550cae..438613a32d 100644
--- a/elf/do-rel.h
+++ b/elf/do-rel.h
@@ -38,7 +38,7 @@ static inline void
elf_dynamic_do_rel (struct link_map *map,
int reltag, int sztag,
Elf32_Addr (*resolve) (const Elf32_Sym **symbol,
- int noplt),
+ Elf32_Addr reloc_addr, int noplt),
int lazy)
{
const Elf32_Sym *const symtab
@@ -53,28 +53,7 @@ elf_dynamic_do_rel (struct link_map *map,
elf_machine_lazy_rel (map, r);
else
for (; r < end; ++r)
- {
- const Elf32_Sym *definer = &symtab[ELF32_R_SYM (r->r_info)];
- Elf32_Addr loadbase;
-
- if (ELF32_R_SYM (r->r_info) == STN_UNDEF)
- loadbase = 0; /* This value will not be consulted. */
- else if (ELF32_ST_BIND (definer->st_info) == STB_LOCAL)
- /* Local symbols always refer to the containing object. */
- loadbase = map->l_addr;
- else
- {
- if (resolve)
- loadbase = (*resolve)
- (&definer, elf_machine_pltrel_p (ELF32_R_TYPE (r->r_info)));
- else
- {
- assert (definer->st_shndx != SHN_UNDEF);
- loadbase = map->l_addr;
- }
- }
- elf_machine_rel (map, r, loadbase, definer);
- }
+ elf_machine_rel (map, r, &symtab[ELF32_R_SYM (r->r_info)], resolve);
}
#undef elf_dynamic_do_rel