aboutsummaryrefslogtreecommitdiff
path: root/elf/link.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/link.h
parent6c03c2cf27b1a12cbf680377e4796b88a20ed9db (diff)
downloadglibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.zip
glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar.gz
glibc-710f7bab59b9bb02f1cd46fa2db14e2b4b0a806a.tar.bz2
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/link.h')
-rw-r--r--elf/link.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/elf/link.h b/elf/link.h
index cd75263..a19a2ce 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -185,12 +185,15 @@ extern void _dl_setup_hash (struct link_map *map);
reference; it is replaced with the defining symbol, and the base load
address of the defining object is returned. SYMBOL_SCOPE is the head of
the chain used for searching. REFERENCE_NAME should name the object
- containing the reference; it is used in error messages. If NOPLT is
- nonzero, then the reference must not be resolved to a PLT entry. */
+ containing the reference; it is used in error messages. RELOC_ADDR is
+ the address being fixed up and the chosen symbol cannot be one with this
+ value. If NOPLT is nonzero, then the reference must not be resolved to
+ a PLT entry. */
extern Elf32_Addr _dl_lookup_symbol (const char *undef,
const Elf32_Sym **sym,
struct link_map *symbol_scope,
const char *reference_name,
+ Elf32_Addr reloc_addr,
int noplt);