mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
32e6df3621
2001-12-11 Jakub Jelinek <jakub@redhat.com> * elf/Makefile (dl-routines): Add conflict. (rtld-ldscript-in, rtld-ldscript, rtld-parms): Remove. (ld.so): Add _begin local symbol. * elf/elf.h (DT_VALTAGIDX, DT_VALNUM, DT_ADDRTAGIDX, DT_ADDRNUM): Define. * elf/dl-deps.c (_dl_build_local_scope): New. (_dl_map_object_deps): If LD_TRACE_PRELINKING, compute local scopes of all libraries. * elf/do-rel.h (VALIDX): Define. (elf_dynamic_do_rel): If ELF_MACHINE_PLT_REL is defined, don't do lazy binding for RELA. If DT_GNU_PRELINKED, DT_RELACOUNT relocations can be skipped. * elf/dl-conflict.c: New file. * elf/dl-lookup.c (_dl_debug_bindings): New. (_dl_lookup_symbol): Use _dl_debug_bindings. Reference_name is always non-NULL. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. * elf/dl-runtime.c (PLTREL): If ELF_MACHINE_PLT_REL is defined, define to ElfW(Rel). * elf/dynamic-link.h (elf_get_dynamic_info): Record selected dynamic tags in the DT_VALRNGLO..DT_VALRNGHI and DT_ADDRRNGLO..DT_ADDRRNGHI ranges. Don't adjust address dynamic tags if l_addr is 0. * elf/rtld.c (_dl_trace_prelink, _dl_trace_prelink_map): New variables. (_dl_start): Skip ELF_DYNAMIC_RELOCATE if ld.so is prelinked. (VALIDX, ADDRIDX): Define. (_dl_start_final): Initialize _dl_rtld_map's l_map_start and l_map_end. (dl_main): Print library list for LD_TRACE_PRELINKING. If prelinking information can be used, skip relocating libraries and call _dl_resolve_conflicts instead. (process_envvars): Handle LD_TRACE_PRELINKING envvar. * elf/dl-load.c (_dl_map_object): Don't create fake libs if LD_TRACE_PRELINKING. * include/link.h (struct link_map) [l_info]: Add DT_VALNUM + DT_ADDRNUM. * sysdeps/generic/ldsodefs.h (_dl_trace_prelink_map): New declaration. (DL_DEBUG_PRELINK): Define. (_dl_resolve_conflicts): Add prototype. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Reinitialize .plt for prelinked libraries where prelinking info cannot be used. (elf_machine_rela): If relocating R_ALPHA_JMP_SLOT in .gnu.conflict section, use RESOLVE_CONFLICT_FIND_MAP to find out reloc's link_map. * sysdeps/arm/bits/link.h: New file. * sysdeps/arm/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (ELF_MACHINE_NO_RELA): Only define if RTLD_BOOTSTRAP. (ELF_MACHINE_PLT_REL): Define. (elf_machine_rela, elf_machine_rela_relative): New. (elf_machine_lazy_rel): Reinitialize R_ARM_JUMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used. * sysdeps/i386/bits/link.h: New file. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (ELF_MACHINE_NO_RELA): Only define if RTLD_BOOTSTRAP. (ELF_MACHINE_PLT_REL): Define. (elf_machine_rela, elf_machine_rela_relative): New. (elf_machine_lazy_rel): Reinitialize R_386_JUMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): If relocating conflicts, skip finaladdr computation. Use RESOLVE_CONFLICT_FIND_MAP to find out map for R_PPC_JMP_SLOT relocs. * sysdeps/sparc/sparc32/dl-machine.h (VALIDX): Define. (OPCODE_BA): Define. (elf_machine_runtime_setup): Reinitialize .plt for prelinked libraries where prelinking info cannot be used. (sparc_fixup_plt): Renamed from elf_machine_fixup_plt. (elf_machine_fixup_plt): Call sparc_fixup_plt. (elf_machine_rela): Set value to 0 if relocating conflicts. Call sparc_fixup_plt for R_SPARC_JMP_SLOT. * sysdeps/sparc/sparc64/dl-machine.h (VALIDX): Define. (sparc64_fixup_plt): Fix a typo. (elf_machine_rela): Set value to 0 if relocating conflicts. Handle R_SPARC_JMP_SLOT relocs when relocating conflicts. (elf_machine_runtime_setup): Reinitialize .plt for prelinked libraries where prelinking info cannot be used. * sysdeps/sh/bits/link.h: New file. * sysdeps/sh/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (elf_machine_lazy_rel): Reinitialize R_SH_JMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used. * sysdeps/s390/s390-32/bits/link.h: New file. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (elf_machine_lazy_rel): Reinitialize R_390_JMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used. * sysdeps/s390/s390-64/bits/link.h: New file. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (elf_machine_lazy_rel): Reinitialize R_390_JMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used. * sysdeps/x86_64/bits/link.h: New file. * sysdeps/x86_64/dl-machine.h (elf_machine_runtime_setup): Save original content of .got[1]. (elf_machine_lazy_rel): Reinitialize R_X86_64_JMP_SLOT address instead of adjusting it if prelinked and prelinking cannot be used.
124 lines
4.3 KiB
C
124 lines
4.3 KiB
C
/* Do relocations for ELF dynamic linking.
|
|
Copyright (C) 1995,96,97,98,99,2000,2001 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 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 RELCOUNT_IDX VERSYMIDX (DT_RELACOUNT)
|
|
# define Rel Rela
|
|
# define elf_machine_rel elf_machine_rela
|
|
# define elf_machine_rel_relative elf_machine_rela_relative
|
|
#else
|
|
# define RELCOUNT_IDX VERSYMIDX (DT_RELCOUNT)
|
|
#endif
|
|
|
|
#ifndef VERSYMIDX
|
|
# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
|
|
#endif
|
|
#ifndef VALIDX
|
|
# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
|
|
+ DT_EXTRANUM + DT_VALTAGIDX (tag))
|
|
#endif
|
|
|
|
/* Perform the relocations in MAP on the running program image as specified
|
|
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,
|
|
ElfW(Addr) reladdr, ElfW(Addr) relsize,
|
|
int lazy)
|
|
{
|
|
const ElfW(Rel) *r = (const void *) reladdr;
|
|
const ElfW(Rel) *end = (const void *) (reladdr + relsize);
|
|
ElfW(Addr) l_addr = map->l_addr;
|
|
|
|
#if (!defined DO_RELA || !defined ELF_MACHINE_PLT_REL) && !defined RTLD_BOOTSTRAP
|
|
/* We never bind lazily during ld.so bootstrap. Unfortunately gcc is
|
|
not clever enough to see through all the function calls to realize
|
|
that. */
|
|
if (lazy)
|
|
{
|
|
/* Doing lazy PLT relocations; they need very little info. */
|
|
for (; r < end; ++r)
|
|
elf_machine_lazy_rel (map, l_addr, r);
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
const ElfW(Sym) *const symtab =
|
|
(const void *) D_PTR (map, l_info[DT_SYMTAB]);
|
|
ElfW(Word) nrelative = (map->l_info[RELCOUNT_IDX] == NULL
|
|
? 0 : map->l_info[RELCOUNT_IDX]->d_un.d_val);
|
|
const ElfW(Rel) *relative = r;
|
|
r = MIN (r + nrelative, end);
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
/* This is defined in rtld.c, but nowhere in the static libc.a; make
|
|
the reference weak so static programs can still link. This
|
|
declaration cannot be done when compiling rtld.c (i.e. #ifdef
|
|
RTLD_BOOTSTRAP) because rtld.c contains the common defn for
|
|
_dl_rtld_map, which is incompatible with a weak decl in the same
|
|
file. */
|
|
weak_extern (_dl_rtld_map);
|
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
|
# ifndef DO_RELA
|
|
/* Rela platforms get the offset from r_addend and this must
|
|
be copied in the relocation address. Therefore we can skip
|
|
the relative relocations only if this is for rel
|
|
relocations... */
|
|
if (l_addr != 0)
|
|
# else
|
|
/* ...or we know the object has been prelinked. */
|
|
if (l_addr != 0 || ! map->l_info[VALIDX(DT_GNU_PRELINKED)])
|
|
# endif
|
|
#endif
|
|
for (; relative < r; ++relative)
|
|
elf_machine_rel_relative (l_addr, relative,
|
|
(void *) (l_addr + relative->r_offset));
|
|
|
|
if (map->l_info[VERSYMIDX (DT_VERSYM)])
|
|
{
|
|
const ElfW(Half) *const version =
|
|
(const void *) D_PTR (map, l_info[VERSYMIDX (DT_VERSYM)]);
|
|
|
|
for (; r < end; ++r)
|
|
{
|
|
ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)];
|
|
elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)],
|
|
&map->l_versions[ndx],
|
|
(void *) (l_addr + r->r_offset));
|
|
}
|
|
}
|
|
else
|
|
for (; r < end; ++r)
|
|
elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL,
|
|
(void *) (l_addr + r->r_offset));
|
|
}
|
|
}
|
|
|
|
#undef elf_dynamic_do_rel
|
|
#undef Rel
|
|
#undef elf_machine_rel
|
|
#undef elf_machine_rel_relative
|
|
#undef RELCOUNT_IDX
|