1998-03-18 14:42:25 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
|
2002-02-01 01:33:04 +00:00
|
|
|
Copyright (C) 1995,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc.
|
1998-03-18 14:42:25 +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.
|
1998-03-18 14:42:25 +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
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1998-03-18 14:42:25 +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. */
|
1998-03-18 14:42:25 +00:00
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "ARM"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
1999-08-10 05:41:26 +00:00
|
|
|
#define VALID_ELF_ABIVERSION(ver) (ver == 0)
|
|
|
|
#define VALID_ELF_OSABI(osabi) \
|
|
|
|
(osabi == ELFOSABI_SYSV || osabi == ELFOSABI_ARM)
|
|
|
|
#define VALID_ELF_HEADER(hdr,exp,size) \
|
|
|
|
memcmp (hdr,exp,size-2) == 0 \
|
|
|
|
&& VALID_ELF_OSABI (hdr[EI_OSABI]) \
|
|
|
|
&& VALID_ELF_ABIVERSION (hdr[EI_ABIVERSION])
|
|
|
|
|
1999-12-19 00:04:05 +00:00
|
|
|
#define CLEAR_CACHE(BEG,END) \
|
|
|
|
{ \
|
|
|
|
register unsigned long _beg __asm ("a1") = (unsigned long)(BEG); \
|
1999-12-21 17:50:57 +00:00
|
|
|
register unsigned long _end __asm ("a2") = (unsigned long)(END); \
|
1999-12-19 00:04:05 +00:00
|
|
|
register unsigned long _flg __asm ("a3") = 0; \
|
2000-01-10 01:43:43 +00:00
|
|
|
__asm __volatile ("swi 0x9f0002 @ sys_cacheflush" \
|
|
|
|
: /* no outputs */ \
|
|
|
|
: /* no inputs */ \
|
|
|
|
: "a1"); \
|
1999-12-19 00:04:05 +00:00
|
|
|
}
|
|
|
|
|
2000-10-21 00:02:39 +00:00
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
1998-03-18 14:42:25 +00:00
|
|
|
static inline int __attribute__ ((unused))
|
2000-10-21 00:02:39 +00:00
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
2000-10-21 00:02:39 +00:00
|
|
|
return ehdr->e_machine == EM_ARM;
|
1998-03-18 14:42:25 +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 ("r10");
|
|
|
|
return *got;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
1999-06-06 09:23:32 +00:00
|
|
|
extern void __dl_start asm ("_dl_start");
|
|
|
|
Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
|
|
|
|
Elf32_Addr pcrel_addr;
|
|
|
|
asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
|
|
|
|
return pcrel_addr - got_addr;
|
1998-03-18 14:42:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
static inline int __attribute__ ((unused))
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
/* patb: this is different than i386 */
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
|
|
in. Their initial contents will arrange when called to push an
|
|
|
|
index into the .got section, load ip with &_GLOBAL_OFFSET_TABLE_[3],
|
|
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
2000-03-31 05:16:38 +00:00
|
|
|
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. */
|
|
|
|
if (got[1])
|
|
|
|
l->l_mach.plt = got[1] + l->l_addr;
|
1998-03-18 14:42:25 +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)
|
|
|
|
{
|
1998-09-18 09:10:43 +00:00
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
2001-08-11 08:57:41 +00:00
|
|
|
|
2002-02-01 01:33:04 +00:00
|
|
|
if (_dl_name_match_p (GL(dl_profile), l))
|
2001-08-11 08:57:41 +00:00
|
|
|
/* Say that we really want profiling and the timers are
|
|
|
|
started. */
|
2002-02-01 01:33:04 +00:00
|
|
|
GL(dl_profile_map) = l;
|
1998-03-18 14:42:25 +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. */
|
|
|
|
// macro for handling PIC situation....
|
|
|
|
#ifdef PIC
|
|
|
|
#define CALL_ROUTINE(x) " ldr sl,0f
|
|
|
|
add sl, pc, sl
|
|
|
|
1: ldr r2, 2f
|
|
|
|
mov lr, pc
|
|
|
|
add pc, sl, r2
|
|
|
|
b 3f
|
|
|
|
0: .word _GLOBAL_OFFSET_TABLE_ - 1b - 4
|
|
|
|
2: .word " #x "(GOTOFF)
|
|
|
|
3: "
|
|
|
|
#else
|
|
|
|
#define CALL_ROUTINE(x) " bl " #x
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef PROF
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
|
|
.text
|
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.type _dl_runtime_resolve, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_resolve:
|
|
|
|
@ we get called with
|
|
|
|
@ stack[0] contains the return address from this call
|
|
|
|
@ ip contains &GOT[n+3] (pointer to function)
|
|
|
|
@ lr points to &GOT[2]
|
|
|
|
|
|
|
|
@ save almost everything; lr is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
|
|
|
|
|
|
|
@ get pointer to linker struct
|
|
|
|
ldr r0, [lr, #-4]
|
|
|
|
|
1998-08-20 17:40:36 +00:00
|
|
|
@ call fixup routine
|
1998-03-18 14:42:25 +00:00
|
|
|
" CALL_ROUTINE(fixup) "
|
|
|
|
|
|
|
|
@ save the return
|
|
|
|
mov ip, r0
|
|
|
|
|
|
|
|
@ restore the stack
|
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
|
|
|
|
|
|
|
@ jump to the newly found address
|
|
|
|
mov pc, ip
|
|
|
|
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
1998-08-28 22:54:57 +00:00
|
|
|
|
1998-03-18 14:42:25 +00:00
|
|
|
.globl _dl_runtime_profile
|
|
|
|
.type _dl_runtime_profile, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_profile:
|
1998-08-20 17:40:36 +00:00
|
|
|
@ save almost everything; lr is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
1998-03-18 14:42:25 +00:00
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
|
|
|
|
|
|
|
@ get pointer to linker struct
|
|
|
|
ldr r0, [lr, #-4]
|
|
|
|
|
1998-08-20 17:40:36 +00:00
|
|
|
@ call profiling fixup routine
|
1998-03-18 14:42:25 +00:00
|
|
|
" CALL_ROUTINE(profile_fixup) "
|
|
|
|
|
|
|
|
@ save the return
|
|
|
|
mov ip, r0
|
|
|
|
|
|
|
|
@ restore the stack
|
1998-08-20 17:40:36 +00:00
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
1998-03-18 14:42:25 +00:00
|
|
|
|
|
|
|
@ jump to the newly found address
|
|
|
|
mov pc, ip
|
|
|
|
|
1998-08-20 17:40:36 +00:00
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
1998-03-18 14:42:25 +00:00
|
|
|
.previous
|
|
|
|
");
|
|
|
|
#else // PROF
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
|
|
.text
|
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.globl _dl_runtime_profile
|
|
|
|
.type _dl_runtime_resolve, #function
|
|
|
|
.type _dl_runtime_profile, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_resolve:
|
|
|
|
_dl_runtime_profile:
|
1998-08-20 17:40:36 +00:00
|
|
|
@ we get called with
|
|
|
|
@ stack[0] contains the return address from this call
|
|
|
|
@ ip contains &GOT[n+3] (pointer to function)
|
|
|
|
@ lr points to &GOT[2]
|
|
|
|
|
|
|
|
@ save almost everything; return add is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
1998-03-18 14:42:25 +00:00
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
1998-08-20 17:40:36 +00:00
|
|
|
|
|
|
|
@ get pointer to linker struct
|
1998-03-18 14:42:25 +00:00
|
|
|
ldr r0, [lr, #-4]
|
1998-08-20 17:40:36 +00:00
|
|
|
|
|
|
|
@ call profiling fixup routine
|
1998-03-18 14:42:25 +00:00
|
|
|
" CALL_ROUTINE(fixup) "
|
1998-08-20 17:40:36 +00:00
|
|
|
|
|
|
|
@ save the return
|
1998-03-18 14:42:25 +00:00
|
|
|
mov ip, r0
|
1998-08-20 17:40:36 +00:00
|
|
|
|
|
|
|
@ restore the stack
|
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
|
|
|
|
|
|
|
@ jump to the newly found address
|
1998-03-18 14:42:25 +00:00
|
|
|
mov pc, ip
|
|
|
|
|
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile
|
|
|
|
.previous
|
|
|
|
");
|
|
|
|
#endif //PROF
|
|
|
|
|
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
|
|
where the dynamic linker should not map anything. */
|
|
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 0xf8000000UL
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
.globl _start
|
|
|
|
.globl _dl_start_user
|
|
|
|
_start:
|
|
|
|
@ at start time, all the args are on the stack
|
|
|
|
mov r0, sp
|
|
|
|
bl _dl_start
|
|
|
|
@ returns user entry point in r0
|
|
|
|
_dl_start_user:
|
|
|
|
mov r6, r0
|
|
|
|
@ we are PIC code, so get global offset table
|
|
|
|
ldr sl, .L_GET_GOT
|
|
|
|
add sl, pc, sl
|
|
|
|
.L_GOT_GOT:
|
1998-08-20 17:40:36 +00:00
|
|
|
@ Store the highest stack address
|
|
|
|
ldr r1, .L_STACK_END
|
|
|
|
ldr r1, [sl, r1]
|
|
|
|
str sp, [r1]
|
1998-03-18 14:42:25 +00:00
|
|
|
@ See if we were run as a command with the executable file
|
|
|
|
@ name as an extra leading argument.
|
2000-04-12 20:12:05 +00:00
|
|
|
ldr r4, .L_SKIP_ARGS
|
|
|
|
ldr r4, [sl, r4]
|
1998-03-18 14:42:25 +00:00
|
|
|
@ get the original arg count
|
2000-04-12 20:12:05 +00:00
|
|
|
ldr r1, [sp]
|
1998-03-18 14:42:25 +00:00
|
|
|
@ subtract _dl_skip_args from it
|
2000-04-12 20:12:05 +00:00
|
|
|
sub r1, r1, r4
|
1998-03-18 14:42:25 +00:00
|
|
|
@ adjust the stack pointer to skip them
|
2000-04-12 20:12:05 +00:00
|
|
|
add sp, sp, r4, lsl #2
|
|
|
|
@ get the argv address
|
|
|
|
add r2, sp, #4
|
1998-03-18 14:42:25 +00:00
|
|
|
@ store the new argc in the new stack location
|
2000-04-12 20:12:05 +00:00
|
|
|
str r1, [sp]
|
|
|
|
@ compute envp
|
|
|
|
add r3, r2, r1, lsl #2
|
|
|
|
add r3, r3, #4
|
1998-03-18 14:42:25 +00:00
|
|
|
|
2000-04-12 20:12:05 +00:00
|
|
|
@ now we call _dl_init
|
|
|
|
ldr r0, .L_LOADED
|
|
|
|
ldr r0, [sl, r0]
|
|
|
|
ldr r0, [r0]
|
|
|
|
@ call _dl_init
|
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
|
|
|
bl _dl_init_internal(PLT)
|
2000-04-12 20:12:05 +00:00
|
|
|
@ clear the startup flag
|
1998-03-18 14:42:25 +00:00
|
|
|
ldr r2, .L_STARTUP_FLAG
|
|
|
|
ldr r1, [sl, r2]
|
2000-04-12 20:12:05 +00:00
|
|
|
mov r0, #0
|
1998-03-18 14:42:25 +00:00
|
|
|
str r0, [r1]
|
|
|
|
@ load the finalizer function
|
|
|
|
ldr r0, .L_FINI_PROC
|
|
|
|
ldr r0, [sl, r0]
|
|
|
|
@ jump to the user_s entry point
|
|
|
|
mov pc, r6
|
|
|
|
.L_GET_GOT:
|
|
|
|
.word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4 \n\
|
|
|
|
.L_SKIP_ARGS: \n\
|
|
|
|
.word _dl_skip_args(GOTOFF) \n\
|
|
|
|
.L_STARTUP_FLAG:
|
|
|
|
.word _dl_starting_up(GOT)
|
|
|
|
.L_FINI_PROC:
|
|
|
|
.word _dl_fini(GOT)
|
1998-08-20 17:40:36 +00:00
|
|
|
.L_STACK_END:
|
|
|
|
.word __libc_stack_end(GOT)
|
2000-04-12 20:12:05 +00:00
|
|
|
.L_LOADED:
|
2002-02-28 22:38:00 +00:00
|
|
|
.word _rtld_local(GOT)
|
1998-03-18 14:42:25 +00:00
|
|
|
.previous\n\
|
|
|
|
");
|
|
|
|
|
2001-08-26 22:28:16 +00:00
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
|
|
|
PLT entries should not be allowed to define the value.
|
|
|
|
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. */
|
|
|
|
#define elf_machine_type_class(type) \
|
|
|
|
((((type) == R_ARM_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
|
|
|
| (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY))
|
1998-03-18 14:42:25 +00:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
1998-06-09 15:16:55 +00:00
|
|
|
#define ELF_MACHINE_JMP_SLOT R_ARM_JUMP_SLOT
|
1998-03-18 14:42:25 +00:00
|
|
|
|
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
|
|
|
/* ARM never uses Elf32_Rela relocations for the dynamic linker.
|
|
|
|
Prelinked libraries may use Elf32_Rela though. */
|
|
|
|
#define ELF_MACHINE_PLT_REL 1
|
1998-03-18 14:42:25 +00:00
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2002-02-01 01:33:04 +00:00
|
|
|
if (GL(dl_platform) != NULL && *GL(dl_platform) == '\0')
|
2000-01-10 01:43:43 +00:00
|
|
|
/* Avoid an empty string which would disturb us. */
|
2002-02-01 01:33:04 +00:00
|
|
|
GL(dl_platform) = NULL;
|
1998-03-18 14:42:25 +00:00
|
|
|
}
|
|
|
|
|
2000-05-05 07:15:29 +00:00
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
|
|
|
const Elf32_Rel *reloc,
|
1998-03-18 14:42:25 +00:00
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
2000-05-05 07:15:29 +00:00
|
|
|
return *reloc_addr = value;
|
1998-03-18 14:42:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the final value of a plt relocation. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
|
|
|
|
Elf32_Addr value)
|
|
|
|
{
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
|
|
|
|
#ifdef RESOLVE
|
|
|
|
|
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
|
|
|
/* ARM never uses Elf32_Rela relocations for the dynamic linker.
|
|
|
|
Prelinked libraries may use Elf32_Rela though. */
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifdef RTLD_BOOTSTRAP
|
|
|
|
# define ELF_MACHINE_NO_RELA 1
|
|
|
|
# endif
|
1998-03-18 14:42:25 +00:00
|
|
|
|
2000-07-29 19:36:10 +00:00
|
|
|
/* Deal with an out-of-range PC24 reloc. */
|
|
|
|
static Elf32_Addr
|
|
|
|
fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
|
|
|
static void *fix_page;
|
|
|
|
static unsigned int fix_offset;
|
|
|
|
static size_t pagesize;
|
|
|
|
Elf32_Word *fix_address;
|
|
|
|
|
|
|
|
if (! fix_page)
|
|
|
|
{
|
|
|
|
if (! pagesize)
|
|
|
|
pagesize = getpagesize ();
|
|
|
|
fix_page = mmap (NULL, pagesize, PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
|
if (! fix_page)
|
|
|
|
assert (! "could not map page for fixup");
|
|
|
|
fix_offset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
fix_address = (Elf32_Word *)(fix_page + fix_offset);
|
|
|
|
fix_address[0] = 0xe51ff004; /* ldr pc, [pc, #-4] */
|
|
|
|
fix_address[1] = value;
|
|
|
|
|
|
|
|
fix_offset += 8;
|
|
|
|
if (fix_offset >= pagesize)
|
|
|
|
fix_page = NULL;
|
|
|
|
|
|
|
|
return (Elf32_Addr)fix_address;
|
|
|
|
}
|
|
|
|
|
1998-03-18 14:42:25 +00:00
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
MAP is the object containing the reloc. */
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
|
|
Elf32_Addr *const reloc_addr)
|
|
|
|
{
|
2001-08-24 08:53:35 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
|
|
|
|
if (__builtin_expect (r_type == R_ARM_RELATIVE, 0))
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
1998-03-18 14:42:25 +00:00
|
|
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
1998-03-18 14:42:25 +00:00
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
}
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
2001-08-24 08:53:35 +00:00
|
|
|
else if (__builtin_expect (r_type == R_ARM_NONE, 0))
|
|
|
|
return;
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
2001-08-24 08:53:35 +00:00
|
|
|
else
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
2001-09-08 21:31:59 +00:00
|
|
|
Elf32_Addr value = RESOLVE (&sym, version, r_type);
|
1998-03-18 14:42:25 +00:00
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
switch (r_type)
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
|
|
|
case R_ARM_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
|
2002-02-01 01:33:04 +00:00
|
|
|
|| (GL(dl_verbose) && sym->st_size < refsym->st_size))
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
|
|
|
const char *strtab;
|
|
|
|
|
2000-03-31 05:16:38 +00:00
|
|
|
strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
2001-02-28 06:36:10 +00:00
|
|
|
_dl_error_printf ("\
|
|
|
|
%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);
|
1998-03-18 14:42:25 +00:00
|
|
|
}
|
|
|
|
memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
|
|
|
|
refsym->st_size));
|
|
|
|
break;
|
|
|
|
case R_ARM_GLOB_DAT:
|
1998-06-09 15:16:55 +00:00
|
|
|
case R_ARM_JUMP_SLOT:
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifdef RTLD_BOOTSTRAP
|
1998-11-27 11:34:40 +00:00
|
|
|
/* Fix weak undefined references. */
|
Update.
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with
load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL,
DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry.
(_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether
rel and rela relocations can both happen and skip one test if this
is not possible.
(ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC
appropriately.
* elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are
already relocated.
* elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already
relocated.
* elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated.
(_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument.
(_dl_map_object): DT_STRTAB entry is already relocated.
* elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are
already relocated.
* elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already
relocated.
* elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and
DT_VERSYM entries are already relocated.
(profile_fixup): Likewise.
* elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace
all users.
(match_symbol): DT_STRTAB entry is already relocated.
(_dl_check_map_versions): Likewise. Also fo DT_VERSYM.
* elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be
relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated.
* elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info.
(find_needed): DT_STRTAB entry is already relocated.
(dl_main): Pass extra argument to elf_get_dynamic_info.
DT_STRTAB entry is already relocated.
* sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and
DT_PLTGOT entries are already relocated.
(elf_machine_rela): Likewise for DT_SYMTAB.
* sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already
relocated.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise.
(elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB.
* grp/initgroups.c (initgroups): If function in current module was
successful don't stop but continue to process to get all the groups.
1999-02-20 15:02:24 +00:00
|
|
|
if (sym != NULL && sym->st_value == 0)
|
1998-11-27 11:34:40 +00:00
|
|
|
*reloc_addr = 0;
|
|
|
|
else
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
1998-11-27 11:34:40 +00:00
|
|
|
*reloc_addr = value;
|
1998-03-18 14:42:25 +00:00
|
|
|
break;
|
1998-06-09 15:16:55 +00:00
|
|
|
case R_ARM_ABS32:
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
1998-03-18 14:42:25 +00:00
|
|
|
/* 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-03-01 09:44:29 +00:00
|
|
|
# ifndef SHARED
|
1998-03-18 14:42:25 +00:00
|
|
|
weak_extern (_dl_rtld_map);
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
1998-03-18 14:42:25 +00:00
|
|
|
if (map == &_dl_rtld_map)
|
|
|
|
/* 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;
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
1998-03-18 14:42:25 +00:00
|
|
|
*reloc_addr += value;
|
|
|
|
break;
|
|
|
|
}
|
1999-12-08 07:38:14 +00:00
|
|
|
case R_ARM_PC24:
|
|
|
|
{
|
2000-07-29 19:36:10 +00:00
|
|
|
Elf32_Sword addend;
|
2001-02-05 06:01:54 +00:00
|
|
|
Elf32_Addr newvalue, topbits;
|
1999-12-08 07:38:14 +00:00
|
|
|
|
|
|
|
addend = *reloc_addr & 0x00ffffff;
|
|
|
|
if (addend & 0x00800000) addend |= 0xff000000;
|
|
|
|
|
2000-07-29 19:36:10 +00:00
|
|
|
newvalue = value - (Elf32_Addr)reloc_addr + (addend << 2);
|
2001-02-05 06:01:54 +00:00
|
|
|
topbits = newvalue & 0xfe000000;
|
|
|
|
if (topbits != 0xfe000000 && topbits != 0x00000000)
|
|
|
|
{
|
|
|
|
newvalue = fix_bad_pc24(reloc_addr, value)
|
|
|
|
- (Elf32_Addr)reloc_addr + (addend << 2);
|
|
|
|
topbits = newvalue & 0xfe000000;
|
|
|
|
if (topbits != 0xfe000000 && topbits != 0x00000000)
|
|
|
|
{
|
2001-09-08 17:45:32 +00:00
|
|
|
_dl_signal_error (0, map->l_name, NULL,
|
2001-02-05 06:01:54 +00:00
|
|
|
"R_ARM_PC24 relocation out of range");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
newvalue >>= 2;
|
2000-07-29 19:36:10 +00:00
|
|
|
value = (*reloc_addr & 0xff000000) | (newvalue & 0x00ffffff);
|
1999-12-08 07:38:14 +00:00
|
|
|
*reloc_addr = value;
|
|
|
|
}
|
|
|
|
break;
|
1998-03-18 14:42:25 +00:00
|
|
|
default:
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
1998-03-18 14:42:25 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
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
|
|
|
static inline void
|
|
|
|
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
|
|
Elf32_Addr *const reloc_addr)
|
|
|
|
{
|
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
|
|
|
|
if (__builtin_expect (r_type == R_ARM_RELATIVE, 0))
|
|
|
|
*reloc_addr = map->l_addr + reloc->r_addend;
|
|
|
|
else if (__builtin_expect (r_type == R_ARM_NONE, 0))
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
|
|
|
Elf32_Addr value = RESOLVE (&sym, version, r_type);
|
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_ARM_GLOB_DAT:
|
|
|
|
case R_ARM_JUMP_SLOT:
|
|
|
|
case R_ARM_ABS32:
|
|
|
|
*reloc_addr = value + reloc->r_addend;
|
|
|
|
break;
|
|
|
|
case R_ARM_PC24:
|
|
|
|
{
|
|
|
|
Elf32_Addr newvalue, topbits;
|
|
|
|
|
|
|
|
newvalue = value + reloc->r_addend - (Elf32_Addr)reloc_addr;
|
|
|
|
topbits = newvalue & 0xfe000000;
|
|
|
|
if (topbits != 0xfe000000 && topbits != 0x00000000)
|
|
|
|
{
|
|
|
|
newvalue = fix_bad_pc24(reloc_addr, value)
|
2001-12-12 09:02:09 +00:00
|
|
|
- (Elf32_Addr)reloc_addr + (reloc->r_addend << 2);
|
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
|
|
|
topbits = newvalue & 0xfe000000;
|
|
|
|
if (topbits != 0xfe000000 && topbits != 0x00000000)
|
|
|
|
{
|
|
|
|
_dl_signal_error (0, map->l_name, NULL,
|
|
|
|
"R_ARM_PC24 relocation out of range");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
newvalue >>= 2;
|
|
|
|
value = (*reloc_addr & 0xff000000) | (newvalue & 0x00ffffff);
|
|
|
|
*reloc_addr = value;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
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
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
static inline void
|
|
|
|
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
|
|
Elf32_Addr *const reloc_addr)
|
|
|
|
{
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
}
|
|
|
|
|
2002-03-01 09:44:29 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
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
|
|
|
static inline void
|
|
|
|
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr *const reloc_addr)
|
|
|
|
{
|
|
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
|
|
}
|
2002-03-01 09:44:29 +00:00
|
|
|
# endif
|
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
|
|
|
|
1998-03-18 14:42:25 +00:00
|
|
|
static inline void
|
1999-07-21 16:58:06 +00:00
|
|
|
elf_machine_lazy_rel (struct link_map *map,
|
|
|
|
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
1998-03-18 14:42:25 +00:00
|
|
|
{
|
1998-08-28 22:54:57 +00:00
|
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
2001-08-24 08:53:35 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
1998-09-18 09:10:43 +00:00
|
|
|
/* Check for unexpected PLT reloc type. */
|
2001-08-24 08:53:35 +00:00
|
|
|
if (__builtin_expect (r_type == R_ARM_JUMP_SLOT, 1))
|
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;
|
|
|
|
}
|
1999-07-21 16:58:06 +00:00
|
|
|
else
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
1998-03-18 14:42:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|