mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 16:21:06 +00:00
710f7bab59
* 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.
62 lines
2.3 KiB
C
62 lines
2.3 KiB
C
/* Do relocations for ELF dynamic linking.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
/* This file may be included twice, to define both
|
|
`elf_dynamic_do_rel' and `elf_dynamic_do_rela'. */
|
|
|
|
#ifdef DO_RELA
|
|
#define elf_dynamic_do_rel elf_dynamic_do_rela
|
|
#define Elf32_Rel Elf32_Rela
|
|
#define elf_machine_rel elf_machine_rela
|
|
#endif
|
|
|
|
|
|
/* 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. */
|
|
|
|
static inline void
|
|
elf_dynamic_do_rel (struct link_map *map,
|
|
int reltag, int sztag,
|
|
Elf32_Addr (*resolve) (const Elf32_Sym **symbol,
|
|
Elf32_Addr reloc_addr, int noplt),
|
|
int lazy)
|
|
{
|
|
const Elf32_Sym *const symtab
|
|
= (const Elf32_Sym *) (map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr);
|
|
const Elf32_Rel *r
|
|
= (const Elf32_Rel *) (map->l_addr + map->l_info[reltag]->d_un.d_ptr);
|
|
const Elf32_Rel *end = &r[map->l_info[sztag]->d_un.d_val / sizeof *r];
|
|
|
|
if (lazy)
|
|
/* Doing lazy PLT relocations; they need very little info. */
|
|
for (; r < end; ++r)
|
|
elf_machine_lazy_rel (map, r);
|
|
else
|
|
for (; r < end; ++r)
|
|
elf_machine_rel (map, r, &symtab[ELF32_R_SYM (r->r_info)], resolve);
|
|
}
|
|
|
|
#undef elf_dynamic_do_rel
|
|
#undef Elf32_Rel
|
|
#undef elf_machine_rel
|