2000-06-12 23:54:16 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. SH version.
|
2004-03-10 19:28:58 +00:00
|
|
|
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
|
|
|
|
|
Free Software Foundation, Inc.
|
2000-06-12 23:54:16 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
2000-06-12 23:54:16 +00:00
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2001-07-06 04:58:11 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
Lesser General Public License for more details.
|
2000-06-12 23:54:16 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
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. */
|
2000-06-12 23:54:16 +00:00
|
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
|
|
/* Only dummy. This doesn't work. */
|
|
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "SH"
|
|
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
2004-10-25 19:07:36 +00:00
|
|
|
#include <sysdep.h>
|
2000-06-12 23:54:16 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
|
2000-10-21 00:02:39 +00:00
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
2000-06-12 23:54:16 +00:00
|
|
|
static inline int __attribute__ ((unused))
|
2000-10-21 00:02:39 +00:00
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
2000-10-21 00:02:39 +00:00
|
|
|
return ehdr->e_machine == EM_SH;
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
|
|
|
|
first element of the GOT. This must be inlined in a function which
|
|
|
|
|
uses global data. */
|
|
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
|
elf_machine_dynamic (void)
|
|
|
|
|
{
|
|
|
|
|
register Elf32_Addr *got;
|
|
|
|
|
asm ("mov r12,%0" :"=r" (got));
|
|
|
|
|
return *got;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
|
{
|
|
|
|
|
Elf32_Addr addr;
|
2002-06-28 21:23:06 +00:00
|
|
|
asm ("mov.l 1f,r0\n\
|
|
|
|
|
mov.l 3f,r2\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
add r12,r2\n\
|
|
|
|
|
mov.l @(r0,r12),r0\n\
|
2002-06-28 21:23:06 +00:00
|
|
|
bra 2f\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
sub r0,r2\n\
|
|
|
|
|
.align 2\n\
|
2002-06-28 21:23:06 +00:00
|
|
|
1: .long _dl_start@GOT\n\
|
|
|
|
|
3: .long _dl_start@GOTOFF\n\
|
|
|
|
|
2: mov r2,%0"
|
2000-06-12 23:54:16 +00:00
|
|
|
: "=r" (addr) : : "r0", "r1", "r2");
|
|
|
|
|
return addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Set up the loaded object described by L so its unrelocated PLT
|
|
|
|
|
entries will jump to the on-demand fixup code in dl-runtime.c. */
|
|
|
|
|
|
2004-10-25 19:07:36 +00:00
|
|
|
static inline int __attribute__ ((unused, always_inline))
|
2000-06-12 23:54:16 +00:00
|
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|
|
|
|
{
|
|
|
|
|
Elf32_Addr *got;
|
|
|
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
|
|
|
|
extern void _dl_runtime_profile (Elf32_Word);
|
|
|
|
|
|
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
|
{
|
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
|
|
|
in. Their initial contents will arrange when called to load an
|
|
|
|
|
offset into the .rela.plt section and _GLOBAL_OFFSET_TABLE_[1],
|
|
|
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
|
|
|
|
got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
|
Update.
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.
2001-12-12 00:21:26 +00:00
|
|
|
/* If a library is prelinked but we have to relocate anyway,
|
|
|
|
|
we have to be able to undo the prelinking of .got.plt.
|
|
|
|
|
The prelinker saved us here address of .plt + 36. */
|
|
|
|
|
if (got[1])
|
|
|
|
|
{
|
|
|
|
|
l->l_mach.plt = got[1] + l->l_addr;
|
|
|
|
|
l->l_mach.gotplt = (Elf32_Addr) &got[3];
|
|
|
|
|
}
|
2000-06-12 23:54:16 +00:00
|
|
|
got[1] = (Elf32_Addr) l; /* Identify this shared object. */
|
|
|
|
|
|
|
|
|
|
/* The got[2] entry contains the address of a function which gets
|
|
|
|
|
called to get the address of a so far unresolved function and
|
|
|
|
|
jump to it. The profiling extension of the dynamic linker allows
|
|
|
|
|
to intercept the calls to collect information. In this case we
|
|
|
|
|
don't store the address in the GOT so that all future calls also
|
|
|
|
|
end in this function. */
|
|
|
|
|
if (profile)
|
|
|
|
|
{
|
|
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
|
|
|
|
/* Say that we really want profiling and the timers are started. */
|
2002-02-01 01:33:04 +00:00
|
|
|
GL(dl_profile_map) = l;
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* This function will get called to fix up the GOT entry indicated by
|
|
|
|
|
the offset on the stack, and then jump to the resolved address. */
|
|
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
|
|
|
|
|
}
|
|
|
|
|
return lazy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
|
|
|
and then redirect to the address it returns. */
|
|
|
|
|
|
|
|
|
|
#define ELF_MACHINE_RUNTIME_FIXUP_ARGS int plt_type
|
|
|
|
|
|
|
|
|
|
#ifdef SHARED
|
|
|
|
|
#define FUN_ADDR "\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l 1f,r2\n\
|
|
|
|
|
mova 1f,r0\n\
|
|
|
|
|
bra 2f\n\
|
|
|
|
|
add r0,r2 ! Get GOT address in r2\n\
|
|
|
|
|
0: .align 2\n\
|
|
|
|
|
1: .long _GLOBAL_OFFSET_TABLE_\n\
|
|
|
|
|
2: mov.l 3f,r0\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
add r2,r0"
|
|
|
|
|
#define GOTJMP(x) #x "@GOTOFF"
|
|
|
|
|
#else
|
|
|
|
|
#define FUN_ADDR "\
|
|
|
|
|
mov.l 3f,r0"
|
|
|
|
|
#define GOTJMP(x) #x
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-06-12 23:58:46 +00:00
|
|
|
#ifdef HAVE_FPU
|
2000-06-12 23:54:16 +00:00
|
|
|
#define FGR_SAVE "\
|
2001-07-26 01:39:53 +00:00
|
|
|
sts.l fpscr, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov #8,r3\n\
|
|
|
|
|
swap.w r3, r3\n\
|
|
|
|
|
lds r3, fpscr\n\
|
|
|
|
|
fmov.s fr11, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr10, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr9, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr8, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr7, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr6, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s fr5, @-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
|
|
|
|
fmov.s fr4, @-r15\n\
|
|
|
|
|
" CFI_ADJUST_CFA_OFFSET (4)
|
2000-06-12 23:54:16 +00:00
|
|
|
#define FGR_LOAD "\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr4\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr5\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr6\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr7\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr8\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr9\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr10\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
fmov.s @r15+, fr11\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
|
|
|
|
lds.l @r15+, fpscr\n\
|
|
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4)
|
2000-06-12 23:54:16 +00:00
|
|
|
#else
|
|
|
|
|
#define FGR_SAVE ""
|
|
|
|
|
#define FGR_LOAD ""
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef PROF
|
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
2001-07-26 01:39:53 +00:00
|
|
|
.text\n\
|
|
|
|
|
.globl _dl_runtime_resolve\n\
|
|
|
|
|
.type _dl_runtime_resolve, @function\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_STARTPROC "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.align 5\n\
|
|
|
|
|
_dl_runtime_resolve:\n\
|
|
|
|
|
mov.l r2,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r4,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r5,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r6,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r7,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r12,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
movt r3 ! Save T flag.\n\
|
|
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_SAVE "\n\
|
|
|
|
|
sts.l pr,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
tst r0,r0\n\
|
|
|
|
|
bt 1f\n\
|
|
|
|
|
mov r0,r2\n\
|
|
|
|
|
1:\n\
|
|
|
|
|
mov r0,r4 ! PLT type\n\
|
|
|
|
|
mov r2,r5 ! link map address\n\
|
|
|
|
|
" FUN_ADDR "\n\
|
|
|
|
|
jsr @r0 ! Call resolver.\n\
|
|
|
|
|
mov r1,r6 ! reloc offset\n\
|
|
|
|
|
lds.l @r15+,pr ! Get register content back.\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_LOAD "\n\
|
|
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
shal r3 ! Lode T flag.\n\
|
|
|
|
|
mov.l @r15+,r12\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r7\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r6\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r5\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r4\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
jmp @r0 ! Jump to function address.\n\
|
|
|
|
|
mov.l @r15+,r2\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.align 2\n\
|
|
|
|
|
3:\n\
|
|
|
|
|
.long " GOTJMP (fixup) "\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ENDPROC "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
|
|
|
\n\
|
|
|
|
|
.globl _dl_runtime_profile\n\
|
|
|
|
|
.type _dl_runtime_profile, @function\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_STARTPROC "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.align 5\n\
|
|
|
|
|
_dl_runtime_profile:\n\
|
|
|
|
|
mov.l r2,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r4,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r5,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r6,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r7,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r12,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
movt r3 ! Save T flag.\n\
|
|
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_SAVE "\n\
|
|
|
|
|
sts.l pr,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
tst r0,r0\n\
|
|
|
|
|
bt 1f\n\
|
|
|
|
|
mov r0,r2\n\
|
|
|
|
|
1:\n\
|
|
|
|
|
mov r0,r4 ! PLT type\n\
|
|
|
|
|
mov r2,r5 ! link map address\n\
|
|
|
|
|
sts pr,r7 ! return address\n\
|
|
|
|
|
" FUN_ADDR "\n\
|
|
|
|
|
jsr @r0 ! Call resolver.\n\
|
|
|
|
|
mov r1,r6 ! reloc offset\n\
|
|
|
|
|
lds.l @r15+,pr ! Get register content back.\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_LOAD "\n\
|
|
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
shal r3 ! Lode T flag.\n\
|
|
|
|
|
mov.l @r15+,r12\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r7\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r6\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r5\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r4\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
jmp @r0 ! Jump to function address.\n\
|
|
|
|
|
mov.l @r15+,r2\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.align 2\n\
|
|
|
|
|
3:\n\
|
|
|
|
|
.long " GOTJMP (profile_fixup) "\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ENDPROC "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
|
|
|
.previous\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
");
|
|
|
|
|
#else
|
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
2001-07-26 01:39:53 +00:00
|
|
|
.text\n\
|
|
|
|
|
.globl _dl_runtime_resolve\n\
|
|
|
|
|
.globl _dl_runtime_profile\n\
|
|
|
|
|
.type _dl_runtime_resolve, @function\n\
|
|
|
|
|
.type _dl_runtime_profile, @function\n\
|
|
|
|
|
.align 5\n\
|
|
|
|
|
_dl_runtime_resolve:\n\
|
|
|
|
|
_dl_runtime_profile:\n\
|
|
|
|
|
mov.l r2,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r4,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r5,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r6,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r7,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l r12,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
movt r3 ! Save T flag.\n\
|
|
|
|
|
mov.l r3,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_SAVE "\n\
|
|
|
|
|
sts.l pr,@-r15\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
tst r0,r0\n\
|
|
|
|
|
bt 1f\n\
|
|
|
|
|
mov r0,r2\n\
|
|
|
|
|
1:\n\
|
|
|
|
|
mov r0,r4 ! PLT type\n\
|
|
|
|
|
mov r2,r5 ! link map address\n\
|
|
|
|
|
sts pr,r7 ! return address\n\
|
|
|
|
|
" FUN_ADDR "\n\
|
|
|
|
|
jsr @r0 ! Call resolver.\n\
|
|
|
|
|
mov r1,r6 ! reloc offset\n\
|
|
|
|
|
lds.l @r15+,pr ! Get register content back.\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
" FGR_LOAD "\n\
|
|
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
shal r3 ! Lode T flag.\n\
|
|
|
|
|
mov.l @r15+,r12\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r7\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r6\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r5\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r4\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
mov.l @r15+,r3\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
jmp @r0 ! Jump to function address.\n\
|
|
|
|
|
mov.l @r15+,r2\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ADJUST_CFA_OFFSET (-4) "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.align 2\n\
|
|
|
|
|
3:\n\
|
|
|
|
|
.long " GOTJMP (fixup) "\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
" CFI_ENDPROC "\n\
|
2001-07-26 01:39:53 +00:00
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
|
|
|
.previous\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
");
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
|
|
|
where the dynamic linker should not map anything. */
|
|
|
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 0x80000000UL
|
|
|
|
|
|
|
|
|
|
/* Initial entry point code for the dynamic linker.
|
|
|
|
|
The C function `_dl_start' is the real entry point;
|
|
|
|
|
its return value is the user program's entry point. */
|
|
|
|
|
|
|
|
|
|
#define RTLD_START asm ("\
|
|
|
|
|
.text\n\
|
|
|
|
|
.globl _start\n\
|
|
|
|
|
.globl _dl_start_user\n\
|
|
|
|
|
_start:\n\
|
|
|
|
|
mov r15,r4\n\
|
|
|
|
|
mov.l .L_dl_start,r1\n\
|
|
|
|
|
mova .L_dl_start,r0\n\
|
|
|
|
|
add r1,r0\n\
|
|
|
|
|
jsr @r0\n\
|
|
|
|
|
nop\n\
|
|
|
|
|
_dl_start_user:\n\
|
|
|
|
|
! Save the user entry point address in r8.\n\
|
|
|
|
|
mov r0,r8\n\
|
|
|
|
|
! Point r12 at the GOT.\n\
|
|
|
|
|
mov.l 1f,r12\n\
|
|
|
|
|
mova 1f,r0\n\
|
|
|
|
|
bra 2f\n\
|
|
|
|
|
add r0,r12\n\
|
|
|
|
|
.align 2\n\
|
|
|
|
|
1: .long _GLOBAL_OFFSET_TABLE_\n\
|
2003-09-24 21:13:55 +00:00
|
|
|
2: ! See if we were run as a command with the executable file\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
! name as an extra leading argument.\n\
|
|
|
|
|
mov.l .L_dl_skip_args,r0\n\
|
|
|
|
|
mov.l @(r0,r12),r0\n\
|
|
|
|
|
mov.l @r0,r0\n\
|
|
|
|
|
! Get the original argument count.\n\
|
|
|
|
|
mov.l @r15,r5\n\
|
|
|
|
|
! Subtract _dl_skip_args from it.\n\
|
|
|
|
|
sub r0,r5\n\
|
|
|
|
|
! Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
|
|
|
shll2 r0\n\
|
|
|
|
|
add r0,r15\n\
|
|
|
|
|
! Store back the modified argument count.\n\
|
|
|
|
|
mov.l r5,@r15\n\
|
|
|
|
|
! Compute argv address and envp.\n\
|
|
|
|
|
mov r15,r6\n\
|
|
|
|
|
add #4,r6\n\
|
|
|
|
|
mov r5,r7\n\
|
|
|
|
|
shll2 r7\n\
|
|
|
|
|
add r15,r7\n\
|
2004-10-25 19:07:36 +00:00
|
|
|
add #8,r7\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
mov.l .L_dl_loaded,r0\n\
|
|
|
|
|
mov.l @(r0,r12),r0\n\
|
|
|
|
|
mov.l @r0,r4\n\
|
|
|
|
|
! Call _dl_init.\n\
|
|
|
|
|
mov.l .L_dl_init,r1\n\
|
|
|
|
|
mova .L_dl_init,r0\n\
|
|
|
|
|
add r1,r0\n\
|
|
|
|
|
jsr @r0\n\
|
|
|
|
|
nop\n\
|
2004-07-14 16:41:44 +00:00
|
|
|
1: ! Pass our finalizer function to the user in r4, as per ELF ABI.\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
mov.l .L_dl_fini,r0\n\
|
|
|
|
|
mov.l @(r0,r12),r4\n\
|
|
|
|
|
! Jump to the user's entry point.\n\
|
|
|
|
|
jmp @r8\n\
|
|
|
|
|
nop\n\
|
|
|
|
|
.align 2\n\
|
|
|
|
|
.L_dl_start:\n\
|
|
|
|
|
.long _dl_start@PLT\n\
|
|
|
|
|
.L_dl_skip_args:\n\
|
|
|
|
|
.long _dl_skip_args@GOT\n\
|
|
|
|
|
.L_dl_init:\n\
|
Update.
Change ld.so to not use functions which are exported. One cannot
interpose them anyway. Use INT() to mark uses, INTDEF() to mark
definitions.
* include/libc-symbols.h: Define INT and INTDEF.
* sysdeps/generic/ldsodefs.h: Declare _dl_debug_printf_internal,
_dl_signal_error_internal, _dl_map_object_internal,
_dl_map_object_deps_internal, _dl_lookup_symbol_internal,
_dl_lookup_versioned_symbol_internal,
_dl_relocate_object_internal, _dl_debug_state_internal,
_dl_start_profile_internal, and _dl_unload_cache_internal.
* include/dlfcn.h: Declare _dl_catch_error_internal.
* elf/rtld.c: Use INT for calls to any of the *_internal functions
above. Add INTDEF to function definitions.
* elf/dl-debug.c: Likewise.
* elf/dl-deps.c: Likewise.
* elf/dl-dst.h: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-fini.c: Likewise.
* elf/dl-init.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-misc.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* sysdeps/generic/dl-cache.c: Likewise.
* sysdeps/generic/dl-sysdep.c: Likewise.
* sysdeps/alpha/dl-machine.h (RTLD_START): Call _dl_init_internal
instead of _dl_init.
* sysdeps/arm/dl-machine.h: Likewise.
* sysdeps/cris/dl-machine.h: Likewise.
* sysdeps/hppa/dl-machine.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.h: Likewise.
* sysdeps/mips/mips64/dl-machine.h: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
* sysdeps/powerpc/dl-start.S (_dl_start_user): Likewise.
* elf/Versions: Don't export _dl_check_all_versions, _dl_sysdep_start,
and _dl_debug_initialize.
2002-02-03 00:31:37 +00:00
|
|
|
.long _dl_init_internal@PLT\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
.L_dl_loaded:\n\
|
2002-02-28 22:38:00 +00:00
|
|
|
.long _rtld_local@GOT\n\
|
2000-06-12 23:54:16 +00:00
|
|
|
.L_dl_fini:\n\
|
|
|
|
|
.long _dl_fini@GOT\n\
|
|
|
|
|
.previous\n\
|
|
|
|
|
");
|
|
|
|
|
|
2002-04-08 21:05:48 +00:00
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
|
|
|
|
|
TLS variable, so undefined references should not be allowed to
|
|
|
|
|
define the value.
|
2001-08-26 22:28:16 +00:00
|
|
|
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
|
|
|
|
of the main executable's symbols, as for a COPY reloc. */
|
* sysdeps/generic/bits/libc-tsd.h [USE___THREAD]: Conditional
changed from [USE_TLS && HAVE___THREAD].
* sysdeps/i386/dl-machine.h (elf_machine_type_class, elf_machine_rel):
Disable TLS relocs if [RTLD_BOOTSTRAP && !USE___THREAD].
* sysdeps/x86_64/dl-machine.h
(elf_machine_type_class, elf_machine_rela): Likewise.
* sysdeps/sh/dl-machine.h (elf_machine_type_class, elf_machine_rela):
Likewise.
* include/link.h (struct link_map): Remove member l_tls_tp_initialized.
* elf/rtld.c (_dl_start_final, dl_main): Don't use it.
(_dl_start): Conditionalize PT_TLS check on [USE___THREAD].
* sysdeps/i386/dl-tls.h (__TLS_GET_ADDR): Use ___tls_get_addr_internal
instead of ___tls_get_addr.
(___tls_get_addr_internal): Add attribute_hidden to decl.
* sysdeps/generic/ldsodefs.h (struct rtld_global): New variable
_dl_error_catch_tsd.
* elf/rtld.c (startup_error_tsd): New function.
(dl_main): Point _dl_error_catch_tsd at that.
* elf/dl-error.c: Don't use libc-tsd.h for DL_ERROR,
use new function pointer instead.
* elf/dl-tsd.c: New file.
* elf/Makefile (routines): Add it.
2002-10-07 Roland McGrath <roland@redhat.com>
* elf/dl-misc.c (_dl_debug_vdprintf): Use INTERNAL_SYSCALL macro for
writev if it's available. Otherwise if [RTLD_PRIVATE_ERRNO] then
take _dl_load_lock around calling __writev.
* sysdeps/unix/sysv/linux/i386/sysdep.h (INTERNAL_SYSCALL): New macro.
(INLINE_SYSCALL): Use that.
* sysdeps/generic/dl-sysdep.h: New file.
* sysdeps/mach/hurd/dl-sysdep.h: New file.
* sysdeps/generic/ldsodefs.h: Include <dl-sysdep.h>.
* include/errno.h [IS_IN_rtld]: Include <dl-sysdep.h> to define ...
[RTLD_PRIVATE_ERRNO]: Use a hidden global variable for errno and
access it directly.
* elf/dl-minimal.c (__errno_location): Removed.
* sysdeps/unix/i386/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]:
Use GOTOFF access for errno.
* sysdeps/unix/sysv/linux/i386/sysdep.h
[RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise.
* sysdeps/unix/x86_64/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]:
Use PC-relative access for errno.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h
[RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise.
* include/tls.h: New file.
(USE___THREAD): New macro.
Define to 1 under [USE_TLS && HAVE___THREAD] and only when compiling
libc or libpthread.
* sysdeps/unix/sysv/linux/i386/sysdep.h [USE___THREAD]: Conditional
changed from [USE_TLS && HAVE___THREAD].
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/unix/i386/sysdep.S: Likewise.
* sysdeps/unix/x86_64/sysdep.S: Likewise.
* include/errno.h: Likewise.
* include/netdb.h: Likewise.
* include/resolv.h: Likewise.
* sysdeps/generic/errno.c: New file.
* csu/Makefile (aux): New variable, list errno.
* sysdeps/unix/sysv/linux/i386/sysdep.S (errno, _errno): Remove defns.
* sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/cris/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/hppa/sysdep.c: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/sysdep.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.S: Likewise.
* sysdeps/unix/alpha/sysdep.S: Likewise.
* sysdeps/generic/start.c: Likewise.
* sysdeps/unix/start.c: Likewise.
* sysdeps/unix/arm/start.c: Likewise.
* sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise.
* sysdeps/unix/sparc/start.c: Likewise.
* sysdeps/unix/sysv/irix4/start.c: Likewise.
* sysdeps/unix/sysv/linux/mips/sysdep.S: File removed.
* manual/search.texi (Tree Search Function, Hash Search Function):
Mention search.h clearly.
2002-10-05 Roland McGrath <roland@redhat.com>
* elf/dl-fxstat64.c: File removed.
* elf/dl-xstat64.c: File removed.
* elf/Makefile (rtld-routines): Remove them.
* sysdeps/unix/sysv/linux/xstat64.c: Remove RTLD_STAT64 conditionals.
Instead, use strong_alias instead of versioned_symbol in the
!SHLIB_COMPAT case.
* sysdeps/unix/sysv/linux/fxstat64.c: Likewise.
* sysdeps/unix/sysv/linux/lxstat64.c: Likewise.
* include/shlib-compat.h
(SHLIB_COMPAT): Require that IS_IN_##lib be defined nonzero.
[! NOT_IN_libc] (IS_IN_libc): Define it.
* cppflags-iterator.mk (CPPFLAGS-$(cpp-src)): Use -Dx=1 not just -Dx.
* elf/Makefile (CPPFLAGS-.os): Likewise.
* sunrpc/rpc_main.c (main): Don't declare with noreturn attribute.
Return the status instead of calling exit.
* Makeconfig (CFLAGS): Prepend -std=gnu99.
* Makerules (+make-deps): Use $(CFLAGS) only for .c sources.
Remove superfluous rm command, whose @ plus make bugs hid
all these commands from the make output.
* include/stubs-prologue.h: New file. Give #error under #ifdef _LIBC.
* Makefile ($(inst_includedir)/gnu/stubs.h): Depend on it.
Use that file's contents instead of literal echo's for the prologue.
* include/features.h: Include <gnu/stubs.h> unconditionally.
* include/gnu/stubs.h: New file.
2002-09-30 Roland McGrath <roland@redhat.com>
* elf/rtld-Rules: New file.
* elf/Makefile ($(objpfx)librtld.map, $(objpfx)librtld.mk,
$(objpfx)rtld-libc.a): New targets.
(generated): Add them.
(reloc-link): Remove -o $@ from the variable.
($(objpfx)dl-allobjs.os): Add -o $@ after $(reloc-link).
(distribute): Add rtld-Rules.
(CPPFLAGS-.os): Define this instead of CFLAGS-.os.
* Makerules ($(+sysdir_pfx)sysd-rules): Emit rules for rtld-% targets.
(common-mostlyclean, common-clean): Clean up rtld-* files.
* sysdeps/unix/make-syscalls.sh: Add rtld-*.os target name to rules.
2002-10-11 10:52:20 +00:00
|
|
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
|
2002-04-08 21:05:48 +00:00
|
|
|
# define elf_machine_type_class(type) \
|
|
|
|
|
((((type) == R_SH_JMP_SLOT || (type) == R_SH_TLS_DTPMOD32 \
|
|
|
|
|
|| (type) == R_SH_TLS_DTPOFF32 || (type) == R_SH_TLS_TPOFF32) \
|
|
|
|
|
* ELF_RTYPE_CLASS_PLT) \
|
|
|
|
|
| (((type) == R_SH_COPY) * ELF_RTYPE_CLASS_COPY))
|
|
|
|
|
#else
|
2001-08-26 22:28:16 +00:00
|
|
|
#define elf_machine_type_class(type) \
|
|
|
|
|
((((type) == R_SH_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
|
|
|
|
| (((type) == R_SH_COPY) * ELF_RTYPE_CLASS_COPY))
|
2002-04-08 21:05:48 +00:00
|
|
|
#endif
|
2000-06-12 23:54:16 +00:00
|
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
|
#define ELF_MACHINE_JMP_SLOT R_SH_JMP_SLOT
|
|
|
|
|
|
|
|
|
|
/* We define an initialization functions. This is called very early in
|
|
|
|
|
_dl_sysdep_start. */
|
|
|
|
|
#define DL_PLATFORM_INIT dl_platform_init ()
|
|
|
|
|
|
|
|
|
|
static inline void __attribute__ ((unused))
|
|
|
|
|
dl_platform_init (void)
|
|
|
|
|
{
|
2004-03-10 19:28:58 +00:00
|
|
|
if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
|
2000-06-12 23:54:16 +00:00
|
|
|
/* Avoid an empty string which would disturb us. */
|
2004-03-10 19:28:58 +00:00
|
|
|
GLRO(dl_platform) = NULL;
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline Elf32_Addr
|
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
|
|
|
|
const Elf32_Rela *reloc,
|
|
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
|
{
|
|
|
|
|
return *reloc_addr = value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the final value of a plt relocation. */
|
|
|
|
|
static inline Elf32_Addr
|
|
|
|
|
elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
|
|
|
|
|
Elf32_Addr value)
|
|
|
|
|
{
|
|
|
|
|
return value + reloc->r_addend;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
|
|
|
|
|
|
#ifdef RESOLVE
|
|
|
|
|
|
|
|
|
|
/* SH never uses Elf32_Rel relocations. */
|
|
|
|
|
#define ELF_MACHINE_NO_REL 1
|
|
|
|
|
|
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
|
MAP is the object containing the reloc. */
|
|
|
|
|
|
2004-10-25 19:07:36 +00:00
|
|
|
auto inline void
|
|
|
|
|
__attribute ((always_inline))
|
2000-06-12 23:54:16 +00:00
|
|
|
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
|
|
|
void *const reloc_addr_arg)
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-08-24 08:53:35 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
2001-07-26 01:39:53 +00:00
|
|
|
Elf32_Addr value;
|
|
|
|
|
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
#define COPY_UNALIGNED_WORD(swp, twp, align) \
|
2001-07-26 01:39:53 +00:00
|
|
|
{ \
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
void *__s = (swp), *__t = (twp); \
|
2004-03-10 19:28:58 +00:00
|
|
|
unsigned char *__s1 = __s, *__t1 = __t; \
|
|
|
|
|
unsigned short *__s2 = __s, *__t2 = __t; \
|
|
|
|
|
unsigned long *__s4 = __s, *__t4 = __t; \
|
2001-07-26 01:39:53 +00:00
|
|
|
switch ((align)) \
|
|
|
|
|
{ \
|
|
|
|
|
case 0: \
|
2004-03-10 19:28:58 +00:00
|
|
|
*__t4 = *__s4; \
|
2001-07-26 01:39:53 +00:00
|
|
|
break; \
|
|
|
|
|
case 2: \
|
2004-03-10 19:28:58 +00:00
|
|
|
*__t2++ = *__s2++; \
|
|
|
|
|
*__t2 = *__s2; \
|
2001-07-26 01:39:53 +00:00
|
|
|
break; \
|
|
|
|
|
default: \
|
2004-03-10 19:28:58 +00:00
|
|
|
*__t1++ = *__s1++; \
|
|
|
|
|
*__t1++ = *__s1++; \
|
|
|
|
|
*__t1++ = *__s1++; \
|
|
|
|
|
*__t1 = *__s1; \
|
2001-07-26 01:39:53 +00:00
|
|
|
break; \
|
|
|
|
|
} \
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
if (__builtin_expect (r_type == R_SH_RELATIVE, 0))
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
2002-02-01 01:33:04 +00:00
|
|
|
if (map != &GL(dl_rtld_map)) /* Already done in rtld itself. */
|
2000-06-12 23:54:16 +00:00
|
|
|
#endif
|
Update.
2000-10-26 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Yutaka Niibe <gniibe@chroot.org>
* sysdeps/sh/dl-machine.h (elf_machine_rela): Handle in place
relocation which is generated by new ld.
* sysdeps/sh/elf/initfini.c (_init): Preseted __fpscr_values.
(_fini): Delete an obsolete register prefix.
* sysdeps/unix/sysv/linux/sh/Versions: Add __xstat64, __fxstat64,
__lxstat64, alphasort64, glob64, readdir64, readdir64_r, scandir64
and versionsort64 as the 2.2-versioned symbols.
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: New file.
* sysdeps/unix/sysv/linux/sh/brk.c: Changes for the new system call
calling convention of the kernel.
* sysdeps/unix/sysv/linux/sh/pipe.S: Likewise.
* sysdeps/unix/sysv/linux/sh/socket.S: Likewise.
* sysdeps/unix/sysv/linux/sh/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sh/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/fcntl.c: New file.
* sysdeps/unix/sysv/linux/sh/lockf64.c: New file.
* sysdeps/unix/sysv/linux/sh/sys/user.h: Include the kernel header
file and delete the definitions of struct user and user_fp.
* sysdeps/unix/sysv/linux/sh/syscall.S: New file.
* sysdeps/unix/sysv/linux/sh/syscalls.list: Remove entries for
s_ioctl, s_ipc, s_llseek, s_chown, s_fchown, s_lchown, s_execve,
rt_sigaction, rt_sigpending, rt_sigprocmask, rt_sigqueueinfo,
rt_sigsuspend, rt_sigtimedwait, s_getcwd, s_getdents, s_getgroups,
s_getpriority, s_getegid, s_geteuid, s_getuid, getresgid, getresuid,
s_getrlimit, s_poll, s_pread64, s_ptrace, s_pwrite64, s_reboot,
s_setrlimit, s_sigaction, s_sigpending, s_sigprocmask, s_sigsuspend,
s_setfsgid, s_setfsuid, s_setgid, s_setgroups, s_setregid,
s_setresgid, s_setresuid, s_setreuid, s_setuid, s_sysctl,
s_ugetrlimit, s_ustat, sys_fstat, sys_lstat, sys_mknod, sys_readv,
sys_stat, sys_writev and syscall.
2000-10-26 02:34:17 +00:00
|
|
|
{
|
|
|
|
|
if (reloc->r_addend)
|
2001-07-26 01:39:53 +00:00
|
|
|
value = map->l_addr + reloc->r_addend;
|
Update.
2000-10-26 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Yutaka Niibe <gniibe@chroot.org>
* sysdeps/sh/dl-machine.h (elf_machine_rela): Handle in place
relocation which is generated by new ld.
* sysdeps/sh/elf/initfini.c (_init): Preseted __fpscr_values.
(_fini): Delete an obsolete register prefix.
* sysdeps/unix/sysv/linux/sh/Versions: Add __xstat64, __fxstat64,
__lxstat64, alphasort64, glob64, readdir64, readdir64_r, scandir64
and versionsort64 as the 2.2-versioned symbols.
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: New file.
* sysdeps/unix/sysv/linux/sh/brk.c: Changes for the new system call
calling convention of the kernel.
* sysdeps/unix/sysv/linux/sh/pipe.S: Likewise.
* sysdeps/unix/sysv/linux/sh/socket.S: Likewise.
* sysdeps/unix/sysv/linux/sh/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sh/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/fcntl.c: New file.
* sysdeps/unix/sysv/linux/sh/lockf64.c: New file.
* sysdeps/unix/sysv/linux/sh/sys/user.h: Include the kernel header
file and delete the definitions of struct user and user_fp.
* sysdeps/unix/sysv/linux/sh/syscall.S: New file.
* sysdeps/unix/sysv/linux/sh/syscalls.list: Remove entries for
s_ioctl, s_ipc, s_llseek, s_chown, s_fchown, s_lchown, s_execve,
rt_sigaction, rt_sigpending, rt_sigprocmask, rt_sigqueueinfo,
rt_sigsuspend, rt_sigtimedwait, s_getcwd, s_getdents, s_getgroups,
s_getpriority, s_getegid, s_geteuid, s_getuid, getresgid, getresuid,
s_getrlimit, s_poll, s_pread64, s_ptrace, s_pwrite64, s_reboot,
s_setrlimit, s_sigaction, s_sigpending, s_sigprocmask, s_sigsuspend,
s_setfsgid, s_setfsuid, s_setgid, s_setgroups, s_setregid,
s_setresgid, s_setresuid, s_setreuid, s_setuid, s_sysctl,
s_ugetrlimit, s_ustat, sys_fstat, sys_lstat, sys_mknod, sys_readv,
sys_stat, sys_writev and syscall.
2000-10-26 02:34:17 +00:00
|
|
|
else
|
2001-07-26 01:39:53 +00:00
|
|
|
{
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (reloc_addr_arg, &value,
|
|
|
|
|
(int) reloc_addr_arg & 3);
|
2001-07-26 01:39:53 +00:00
|
|
|
value += map->l_addr;
|
|
|
|
|
}
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (&value, reloc_addr_arg,
|
|
|
|
|
(int) reloc_addr_arg & 3);
|
Update.
2000-10-26 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Yutaka Niibe <gniibe@chroot.org>
* sysdeps/sh/dl-machine.h (elf_machine_rela): Handle in place
relocation which is generated by new ld.
* sysdeps/sh/elf/initfini.c (_init): Preseted __fpscr_values.
(_fini): Delete an obsolete register prefix.
* sysdeps/unix/sysv/linux/sh/Versions: Add __xstat64, __fxstat64,
__lxstat64, alphasort64, glob64, readdir64, readdir64_r, scandir64
and versionsort64 as the 2.2-versioned symbols.
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: New file.
* sysdeps/unix/sysv/linux/sh/brk.c: Changes for the new system call
calling convention of the kernel.
* sysdeps/unix/sysv/linux/sh/pipe.S: Likewise.
* sysdeps/unix/sysv/linux/sh/socket.S: Likewise.
* sysdeps/unix/sysv/linux/sh/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sh/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/fcntl.c: New file.
* sysdeps/unix/sysv/linux/sh/lockf64.c: New file.
* sysdeps/unix/sysv/linux/sh/sys/user.h: Include the kernel header
file and delete the definitions of struct user and user_fp.
* sysdeps/unix/sysv/linux/sh/syscall.S: New file.
* sysdeps/unix/sysv/linux/sh/syscalls.list: Remove entries for
s_ioctl, s_ipc, s_llseek, s_chown, s_fchown, s_lchown, s_execve,
rt_sigaction, rt_sigpending, rt_sigprocmask, rt_sigqueueinfo,
rt_sigsuspend, rt_sigtimedwait, s_getcwd, s_getdents, s_getgroups,
s_getpriority, s_getegid, s_geteuid, s_getuid, getresgid, getresuid,
s_getrlimit, s_poll, s_pread64, s_ptrace, s_pwrite64, s_reboot,
s_setrlimit, s_sigaction, s_sigpending, s_sigprocmask, s_sigsuspend,
s_setfsgid, s_setfsuid, s_setgid, s_setgroups, s_setregid,
s_setresgid, s_setresuid, s_setreuid, s_setuid, s_sysctl,
s_ugetrlimit, s_ustat, sys_fstat, sys_lstat, sys_mknod, sys_readv,
sys_stat, sys_writev and syscall.
2000-10-26 02:34:17 +00:00
|
|
|
}
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
2001-08-24 08:53:35 +00:00
|
|
|
#ifndef RTLD_BOOTSTRAP
|
2001-09-19 03:25:37 +00:00
|
|
|
else if (__builtin_expect (r_type == R_SH_NONE, 0))
|
2001-08-24 08:53:35 +00:00
|
|
|
return;
|
|
|
|
|
#endif
|
|
|
|
|
else
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
2002-04-08 21:05:48 +00:00
|
|
|
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
|
|
|
|
|
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
|
2001-07-26 01:39:53 +00:00
|
|
|
|
2002-04-08 21:05:48 +00:00
|
|
|
value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
value = RESOLVE (&sym, version, r_type);
|
|
|
|
|
# ifndef RTLD_BOOTSTRAP
|
|
|
|
|
if (sym != NULL)
|
|
|
|
|
# endif
|
2000-06-12 23:54:16 +00:00
|
|
|
value += sym->st_value;
|
2002-04-08 21:05:48 +00:00
|
|
|
#endif
|
2000-06-12 23:54:16 +00:00
|
|
|
value += reloc->r_addend;
|
|
|
|
|
|
2002-04-08 21:05:48 +00:00
|
|
|
switch (r_type)
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
|
|
|
|
case R_SH_COPY:
|
|
|
|
|
if (sym == NULL)
|
|
|
|
|
/* This can happen in trace mode if an object could not be
|
|
|
|
|
found. */
|
|
|
|
|
break;
|
|
|
|
|
if (sym->st_size > refsym->st_size
|
2004-03-10 19:28:58 +00:00
|
|
|
|| (sym->st_size < refsym->st_size && GLRO(dl_verbose)))
|
2000-06-12 23:54:16 +00:00
|
|
|
{
|
|
|
|
|
const char *strtab;
|
|
|
|
|
|
|
|
|
|
strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
|
2001-02-28 06:36:10 +00:00
|
|
|
_dl_error_printf ("\
|
2001-03-06 07:30:22 +00:00
|
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
2002-03-01 09:44:29 +00:00
|
|
|
rtld_progname ?: "<program name unknown>",
|
2001-02-28 06:36:10 +00:00
|
|
|
strtab + refsym->st_name);
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
memcpy (reloc_addr_arg, (void *) value,
|
|
|
|
|
MIN (sym->st_size, refsym->st_size));
|
2000-06-12 23:54:16 +00:00
|
|
|
break;
|
|
|
|
|
case R_SH_GLOB_DAT:
|
|
|
|
|
case R_SH_JMP_SLOT:
|
2001-07-26 01:39:53 +00:00
|
|
|
/* These addresses are always aligned. */
|
2000-06-12 23:54:16 +00:00
|
|
|
*reloc_addr = value;
|
|
|
|
|
break;
|
* sysdeps/generic/bits/libc-tsd.h [USE___THREAD]: Conditional
changed from [USE_TLS && HAVE___THREAD].
* sysdeps/i386/dl-machine.h (elf_machine_type_class, elf_machine_rel):
Disable TLS relocs if [RTLD_BOOTSTRAP && !USE___THREAD].
* sysdeps/x86_64/dl-machine.h
(elf_machine_type_class, elf_machine_rela): Likewise.
* sysdeps/sh/dl-machine.h (elf_machine_type_class, elf_machine_rela):
Likewise.
* include/link.h (struct link_map): Remove member l_tls_tp_initialized.
* elf/rtld.c (_dl_start_final, dl_main): Don't use it.
(_dl_start): Conditionalize PT_TLS check on [USE___THREAD].
* sysdeps/i386/dl-tls.h (__TLS_GET_ADDR): Use ___tls_get_addr_internal
instead of ___tls_get_addr.
(___tls_get_addr_internal): Add attribute_hidden to decl.
* sysdeps/generic/ldsodefs.h (struct rtld_global): New variable
_dl_error_catch_tsd.
* elf/rtld.c (startup_error_tsd): New function.
(dl_main): Point _dl_error_catch_tsd at that.
* elf/dl-error.c: Don't use libc-tsd.h for DL_ERROR,
use new function pointer instead.
* elf/dl-tsd.c: New file.
* elf/Makefile (routines): Add it.
2002-10-07 Roland McGrath <roland@redhat.com>
* elf/dl-misc.c (_dl_debug_vdprintf): Use INTERNAL_SYSCALL macro for
writev if it's available. Otherwise if [RTLD_PRIVATE_ERRNO] then
take _dl_load_lock around calling __writev.
* sysdeps/unix/sysv/linux/i386/sysdep.h (INTERNAL_SYSCALL): New macro.
(INLINE_SYSCALL): Use that.
* sysdeps/generic/dl-sysdep.h: New file.
* sysdeps/mach/hurd/dl-sysdep.h: New file.
* sysdeps/generic/ldsodefs.h: Include <dl-sysdep.h>.
* include/errno.h [IS_IN_rtld]: Include <dl-sysdep.h> to define ...
[RTLD_PRIVATE_ERRNO]: Use a hidden global variable for errno and
access it directly.
* elf/dl-minimal.c (__errno_location): Removed.
* sysdeps/unix/i386/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]:
Use GOTOFF access for errno.
* sysdeps/unix/sysv/linux/i386/sysdep.h
[RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise.
* sysdeps/unix/x86_64/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]:
Use PC-relative access for errno.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h
[RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise.
* include/tls.h: New file.
(USE___THREAD): New macro.
Define to 1 under [USE_TLS && HAVE___THREAD] and only when compiling
libc or libpthread.
* sysdeps/unix/sysv/linux/i386/sysdep.h [USE___THREAD]: Conditional
changed from [USE_TLS && HAVE___THREAD].
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/unix/i386/sysdep.S: Likewise.
* sysdeps/unix/x86_64/sysdep.S: Likewise.
* include/errno.h: Likewise.
* include/netdb.h: Likewise.
* include/resolv.h: Likewise.
* sysdeps/generic/errno.c: New file.
* csu/Makefile (aux): New variable, list errno.
* sysdeps/unix/sysv/linux/i386/sysdep.S (errno, _errno): Remove defns.
* sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/cris/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/hppa/sysdep.c: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/sysdep.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.S: Likewise.
* sysdeps/unix/alpha/sysdep.S: Likewise.
* sysdeps/generic/start.c: Likewise.
* sysdeps/unix/start.c: Likewise.
* sysdeps/unix/arm/start.c: Likewise.
* sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise.
* sysdeps/unix/sparc/start.c: Likewise.
* sysdeps/unix/sysv/irix4/start.c: Likewise.
* sysdeps/unix/sysv/linux/mips/sysdep.S: File removed.
* manual/search.texi (Tree Search Function, Hash Search Function):
Mention search.h clearly.
2002-10-05 Roland McGrath <roland@redhat.com>
* elf/dl-fxstat64.c: File removed.
* elf/dl-xstat64.c: File removed.
* elf/Makefile (rtld-routines): Remove them.
* sysdeps/unix/sysv/linux/xstat64.c: Remove RTLD_STAT64 conditionals.
Instead, use strong_alias instead of versioned_symbol in the
!SHLIB_COMPAT case.
* sysdeps/unix/sysv/linux/fxstat64.c: Likewise.
* sysdeps/unix/sysv/linux/lxstat64.c: Likewise.
* include/shlib-compat.h
(SHLIB_COMPAT): Require that IS_IN_##lib be defined nonzero.
[! NOT_IN_libc] (IS_IN_libc): Define it.
* cppflags-iterator.mk (CPPFLAGS-$(cpp-src)): Use -Dx=1 not just -Dx.
* elf/Makefile (CPPFLAGS-.os): Likewise.
* sunrpc/rpc_main.c (main): Don't declare with noreturn attribute.
Return the status instead of calling exit.
* Makeconfig (CFLAGS): Prepend -std=gnu99.
* Makerules (+make-deps): Use $(CFLAGS) only for .c sources.
Remove superfluous rm command, whose @ plus make bugs hid
all these commands from the make output.
* include/stubs-prologue.h: New file. Give #error under #ifdef _LIBC.
* Makefile ($(inst_includedir)/gnu/stubs.h): Depend on it.
Use that file's contents instead of literal echo's for the prologue.
* include/features.h: Include <gnu/stubs.h> unconditionally.
* include/gnu/stubs.h: New file.
2002-09-30 Roland McGrath <roland@redhat.com>
* elf/rtld-Rules: New file.
* elf/Makefile ($(objpfx)librtld.map, $(objpfx)librtld.mk,
$(objpfx)rtld-libc.a): New targets.
(generated): Add them.
(reloc-link): Remove -o $@ from the variable.
($(objpfx)dl-allobjs.os): Add -o $@ after $(reloc-link).
(distribute): Add rtld-Rules.
(CPPFLAGS-.os): Define this instead of CFLAGS-.os.
* Makerules ($(+sysdir_pfx)sysd-rules): Emit rules for rtld-% targets.
(common-mostlyclean, common-clean): Clean up rtld-* files.
* sysdeps/unix/make-syscalls.sh: Add rtld-*.os target name to rules.
2002-10-11 10:52:20 +00:00
|
|
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
|
2002-04-08 21:05:48 +00:00
|
|
|
/* XXX Remove TLS relocations which are not needed. */
|
|
|
|
|
case R_SH_TLS_DTPMOD32:
|
|
|
|
|
# ifdef RTLD_BOOTSTRAP
|
|
|
|
|
/* During startup the dynamic linker is always the module
|
|
|
|
|
with index 1.
|
|
|
|
|
XXX If this relocation is necessary move before RESOLVE
|
|
|
|
|
call. */
|
|
|
|
|
*reloc_addr = 1;
|
|
|
|
|
# else
|
|
|
|
|
/* Get the information from the link map returned by the
|
|
|
|
|
resolv function. */
|
|
|
|
|
if (sym_map != NULL)
|
|
|
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
|
|
|
# endif
|
|
|
|
|
break;
|
|
|
|
|
case R_SH_TLS_DTPOFF32:
|
|
|
|
|
# ifndef RTLD_BOOTSTRAP
|
|
|
|
|
/* During relocation all TLS symbols are defined and used.
|
|
|
|
|
Therefore the offset is already correct. */
|
|
|
|
|
if (sym != NULL)
|
|
|
|
|
*reloc_addr = sym->st_value;
|
|
|
|
|
# endif
|
|
|
|
|
break;
|
|
|
|
|
case R_SH_TLS_TPOFF32:
|
|
|
|
|
/* The offset is positive, afterward from the thread pointer. */
|
|
|
|
|
# ifdef RTLD_BOOTSTRAP
|
2002-10-02 06:22:02 +00:00
|
|
|
*reloc_addr = map->l_tls_offset + sym->st_value + reloc->r_addend;
|
2002-04-08 21:05:48 +00:00
|
|
|
# else
|
|
|
|
|
/* We know the offset of object the symbol is contained in.
|
|
|
|
|
It is a positive value which will be added to the thread
|
|
|
|
|
pointer. To get the variable position in the TLS block
|
|
|
|
|
we add the offset from that of the TLS block. */
|
2004-05-17 18:59:35 +00:00
|
|
|
if (sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
|
*reloc_addr = sym_map->l_tls_offset + sym->st_value
|
|
|
|
|
+ reloc->r_addend;
|
|
|
|
|
}
|
2002-04-08 21:05:48 +00:00
|
|
|
# endif
|
|
|
|
|
break;
|
|
|
|
|
#endif /* use TLS */
|
2000-06-12 23:54:16 +00:00
|
|
|
case R_SH_DIR32:
|
|
|
|
|
{
|
|
|
|
|
#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. */
|
2002-02-01 01:33:04 +00:00
|
|
|
# ifndef SHARED
|
2004-03-10 19:28:58 +00:00
|
|
|
weak_extern (_dl_rtld_map);
|
2002-02-01 01:33:04 +00:00
|
|
|
# endif
|
|
|
|
|
if (map == &GL(dl_rtld_map))
|
2000-06-12 23:54:16 +00:00
|
|
|
/* Undo the relocation done here during bootstrapping.
|
|
|
|
|
Now we will relocate it anew, possibly using a
|
|
|
|
|
binding found in the user program or a loaded library
|
|
|
|
|
rather than the dynamic linker's built-in definitions
|
|
|
|
|
used while loading those libraries. */
|
|
|
|
|
value -= map->l_addr + refsym->st_value + reloc->r_addend;
|
|
|
|
|
#endif
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (&value, reloc_addr_arg,
|
|
|
|
|
(int) reloc_addr_arg & 3);
|
2000-06-12 23:54:16 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case R_SH_REL32:
|
2001-07-26 01:39:53 +00:00
|
|
|
value = (value - (Elf32_Addr) reloc_addr);
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (&value, reloc_addr_arg,
|
|
|
|
|
(int) reloc_addr_arg & 3);
|
2000-06-12 23:54:16 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
2002-04-08 21:05:48 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
2000-06-12 23:54:16 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-08-24 08:53:35 +00:00
|
|
|
}
|
|
|
|
|
|
2004-10-25 19:07:36 +00:00
|
|
|
auto inline void
|
|
|
|
|
__attribute__ ((always_inline))
|
2001-08-24 14:58:03 +00:00
|
|
|
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
void *const reloc_addr_arg)
|
2001-08-24 08:53:35 +00:00
|
|
|
{
|
2001-09-19 03:25:37 +00:00
|
|
|
Elf32_Addr value;
|
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
if (reloc->r_addend)
|
|
|
|
|
value = l_addr + reloc->r_addend;
|
|
|
|
|
else
|
|
|
|
|
{
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (reloc_addr_arg, &value, (int) reloc_addr_arg & 3);
|
2001-08-24 08:53:35 +00:00
|
|
|
value += l_addr;
|
|
|
|
|
}
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
COPY_UNALIGNED_WORD (&value, reloc_addr_arg, (int) reloc_addr_arg & 3);
|
2001-07-26 01:39:53 +00:00
|
|
|
|
|
|
|
|
#undef COPY_UNALIGNED_WORD
|
2000-06-12 23:54:16 +00:00
|
|
|
}
|
|
|
|
|
|
2004-10-25 19:07:36 +00:00
|
|
|
auto inline void
|
|
|
|
|
__attribute__ ((always_inline))
|
2000-06-12 23:54:16 +00:00
|
|
|
elf_machine_lazy_rel (struct link_map *map,
|
|
|
|
|
Elf32_Addr l_addr, const Elf32_Rela *reloc)
|
|
|
|
|
{
|
|
|
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
|
|
|
|
/* Check for unexpected PLT reloc type. */
|
|
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_SH_JMP_SLOT)
|
Update.
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.
2001-12-12 00:21:26 +00:00
|
|
|
{
|
|
|
|
|
if (__builtin_expect (map->l_mach.plt, 0) == 0)
|
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
|
else
|
|
|
|
|
*reloc_addr =
|
|
|
|
|
map->l_mach.plt
|
|
|
|
|
+ (((Elf32_Addr) reloc_addr) - map->l_mach.gotplt) * 7;
|
|
|
|
|
}
|
2000-06-12 23:54:16 +00:00
|
|
|
else
|
|
|
|
|
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|
