2000-08-02 15:15:00 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. S390 Version.
|
2002-02-01 01:33:04 +00:00
|
|
|
Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
|
2000-08-02 15:15:00 +00:00
|
|
|
Contributed by Carl Pederson & Martin Schwidefsky.
|
|
|
|
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-08-02 15:15:00 +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.
|
2000-08-02 15:15:00 +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-08-02 15:15:00 +00:00
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "s390"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <link.h>
|
|
|
|
|
2001-03-09 17:33:11 +00:00
|
|
|
/* This is an older, now obsolete value. */
|
|
|
|
#define EM_S390_OLD 0xA390
|
2000-08-02 15:15:00 +00:00
|
|
|
|
2000-10-21 00:02:39 +00:00
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
2000-08-02 15:15:00 +00:00
|
|
|
static inline int
|
2000-10-21 00:02:39 +00:00
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
2000-08-02 15:15:00 +00:00
|
|
|
{
|
2001-03-16 09:57:45 +00:00
|
|
|
return (ehdr->e_machine == EM_S390 || ehdr->e_machine == EM_S390_OLD)
|
|
|
|
&& ehdr->e_ident[EI_CLASS] == ELFCLASS32;
|
2000-08-02 15:15:00 +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
|
|
|
|
elf_machine_dynamic (void)
|
|
|
|
{
|
|
|
|
register Elf32_Addr *got;
|
|
|
|
|
|
|
|
asm( " bras %0,2f\n"
|
|
|
|
"1: .long _GLOBAL_OFFSET_TABLE_-1b\n"
|
|
|
|
"2: al %0,0(%0)"
|
|
|
|
: "=&a" (got) : : "0" );
|
|
|
|
|
|
|
|
return *got;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
|
|
|
Elf32_Addr addr;
|
|
|
|
|
|
|
|
asm( " bras 1,2f\n"
|
|
|
|
"1: .long _GLOBAL_OFFSET_TABLE_ - 1b\n"
|
|
|
|
" .long _dl_start - 1b - 0x80000000\n"
|
|
|
|
"2: l %0,4(1)\n"
|
|
|
|
" ar %0,1\n"
|
|
|
|
" al 1,0(1)\n"
|
|
|
|
" sl %0,_dl_start@GOT12(1)"
|
|
|
|
: "=&d" (addr) : : "1" );
|
|
|
|
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. */
|
|
|
|
|
|
|
|
static inline int __attribute__ ((unused))
|
|
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|
|
|
{
|
|
|
|
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 push an
|
|
|
|
offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1],
|
|
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
|
|
|
Elf32_Addr *got;
|
|
|
|
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 + 0x2c. */
|
|
|
|
if (got[1])
|
|
|
|
{
|
|
|
|
l->l_mach.plt = got[1] + l->l_addr;
|
|
|
|
l->l_mach.gotplt = (Elf32_Addr) &got[3];
|
|
|
|
}
|
2000-08-02 15:15:00 +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 (__builtin_expect (profile, 0))
|
|
|
|
{
|
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
|
|
|
|
2002-02-01 01:33:04 +00:00
|
|
|
if (_dl_name_match_p (GL(dl_profile), l))
|
2000-08-02 15:15:00 +00:00
|
|
|
/* This is the object we are looking for. 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-08-02 15:15:00 +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. */
|
|
|
|
|
|
|
|
/* s390:
|
|
|
|
Arguments are in register.
|
|
|
|
r2 - r7 holds the original parameters for the function call, fixup
|
|
|
|
and trampoline code use r0-r5 and r14-15. For the correct function
|
|
|
|
call r2-r5 and r14-15 must be restored.
|
|
|
|
Arguments from the PLT are stored at 24(r15) and 28(r15)
|
|
|
|
and must be moved to r2 and r3 for the fixup call (see elf32-s390.c
|
|
|
|
in the binutils for the PLT code).
|
|
|
|
Fixup function address in r2.
|
|
|
|
*/
|
|
|
|
#ifndef PROF
|
|
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
|
|
|
|
asm ( "\
|
|
|
|
.text\n\
|
|
|
|
.globl _dl_runtime_resolve\n\
|
|
|
|
.type _dl_runtime_resolve, @function\n\
|
|
|
|
.align 16\n\
|
|
|
|
_dl_runtime_resolve:\n\
|
|
|
|
# save registers\n\
|
|
|
|
stm 2,5,32(15)\n\
|
|
|
|
st 14,48(15)\n\
|
|
|
|
lr 0,15\n\
|
|
|
|
ahi 15,-96\n\
|
|
|
|
st 0,0(15)\n\
|
|
|
|
# load args saved by PLT\n\
|
|
|
|
lm 2,3,120(15)\n\
|
|
|
|
basr 1,0\n\
|
|
|
|
0: ahi 1,1f-0b\n\
|
|
|
|
l 14,0(1)\n\
|
|
|
|
bas 14,0(14,1) # call fixup\n\
|
|
|
|
lr 1,2 # function addr returned in r2\n\
|
|
|
|
# restore registers\n\
|
|
|
|
ahi 15,96\n\
|
|
|
|
l 14,48(15)\n\
|
|
|
|
lm 2,5,32(15)\n\
|
|
|
|
br 1\n\
|
|
|
|
1: .long fixup-1b\n\
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
|
|
\n\
|
|
|
|
.globl _dl_runtime_profile\n\
|
|
|
|
.type _dl_runtime_profile, @function\n\
|
|
|
|
.align 16\n\
|
|
|
|
_dl_runtime_profile:\n\
|
|
|
|
# save registers\n\
|
|
|
|
stm 2,5,32(15)\n\
|
|
|
|
st 14,48(15)\n\
|
|
|
|
lr 0,15\n\
|
|
|
|
ahi 15,-96\n\
|
|
|
|
st 0,0(15)\n\
|
|
|
|
# load args saved by PLT\n\
|
|
|
|
lm 2,3,120(15)\n\
|
|
|
|
# load return address as third parameter\n\
|
|
|
|
lr 4,14\n\
|
|
|
|
basr 1,0\n\
|
|
|
|
0: ahi 1,1f-0b\n\
|
|
|
|
l 14,0(1)\n\
|
|
|
|
bas 14,0(14,1) # call fixup\n\
|
|
|
|
lr 1,2 # function addr returned in r2\n\
|
|
|
|
# restore registers\n\
|
|
|
|
ahi 15,96\n\
|
|
|
|
l 14,48(15)\n\
|
|
|
|
lm 2,5,32(15)\n\
|
|
|
|
br 1\n\
|
|
|
|
1: .long profile_fixup-1b\n\
|
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
|
|
");
|
|
|
|
#else
|
|
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
|
|
|
|
asm ( "\
|
|
|
|
.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 16\n\
|
|
|
|
_dl_runtime_resolve:\n\
|
|
|
|
_dl_runtime_profile:\n\
|
|
|
|
# save registers\n\
|
|
|
|
stm 2,5,32(15)\n\
|
|
|
|
st 14,48(15)\n\
|
|
|
|
lr 0,15\n\
|
|
|
|
ahi 15,-96\n\
|
|
|
|
st 0,0(15)\n\
|
|
|
|
# load args saved by PLT\n\
|
|
|
|
lm 2,3,120(15)\n\
|
|
|
|
# load return address as third parameter\n\
|
|
|
|
lr 4,14\n\
|
|
|
|
basr 1,0\n\
|
|
|
|
0: ahi 1,1f-0b\n\
|
|
|
|
l 14,0(1)\n\
|
|
|
|
bas 14,0(14,1) # call fixup\n\
|
|
|
|
lr 1,2 # function addr returned in r2\n\
|
|
|
|
# restore registers\n\
|
|
|
|
ahi 15,96\n\
|
|
|
|
l 14,48(15)\n\
|
|
|
|
lm 2,5,32(15)\n\
|
|
|
|
br 1\n\
|
|
|
|
1: .long fixup-1b\n\
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
|
|
");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* 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 ("\n\
|
|
|
|
.text\n\
|
|
|
|
.align 4\n\
|
|
|
|
.globl _start\n\
|
|
|
|
.globl _dl_start_user\n\
|
|
|
|
_start:\n\
|
|
|
|
basr %r13,0\n\
|
|
|
|
.L0: ahi %r13,.Llit-.L0\n\
|
|
|
|
lr %r2,%r15\n\
|
|
|
|
# Alloc stack frame\n\
|
|
|
|
ahi %r15,-96\n\
|
|
|
|
# Set the back chain to zero\n\
|
|
|
|
xc 0(4,%r15),0(%r15)\n\
|
|
|
|
# Call _dl_start with %r2 pointing to arg on stack\n\
|
|
|
|
l %r14,.Ladr1-.Llit(%r13)\n\
|
|
|
|
bas %r14,0(%r14,%r13) # call _dl_start\n\
|
|
|
|
_dl_start_user:\n\
|
|
|
|
# Save the user entry point address in %r8.\n\
|
|
|
|
lr %r8,%r2\n\
|
|
|
|
# Point %r12 at the GOT.\n\
|
|
|
|
l %r12,.Ladr0-.Llit(%r13)\n\
|
|
|
|
ar %r12,%r13\n\
|
|
|
|
# Store the highest stack address\n\
|
|
|
|
l %r1,__libc_stack_end@GOT(%r12)\n\
|
|
|
|
st %r15, 0(%r1)\n\
|
|
|
|
# See if we were run as a command with the executable file\n\
|
|
|
|
# name as an extra leading argument.\n\
|
|
|
|
l %r1,_dl_skip_args@GOT12(0,%r12)\n\
|
|
|
|
l %r1,0(%r1) # load _dl_skip_args\n\
|
|
|
|
# Get the original argument count.\n\
|
|
|
|
l %r0,96(%r15)\n\
|
|
|
|
# Subtract _dl_skip_args from it.\n\
|
|
|
|
sr %r0,%r1\n\
|
|
|
|
# Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
|
|
sll %r1,2\n\
|
|
|
|
ar %r15,%r1\n\
|
|
|
|
# Set the back chain to zero again\n\
|
|
|
|
xc 0(4,%r15),0(%r15)\n\
|
|
|
|
# Store back the modified argument count.\n\
|
|
|
|
st %r0,96(%r15)\n\
|
|
|
|
# The special initializer gets called with the stack just\n\
|
|
|
|
# as the application's entry point will see it; it can\n\
|
|
|
|
# switch stacks if it moves these contents over.\n\
|
|
|
|
" RTLD_START_SPECIAL_INIT "\n\
|
|
|
|
# Call the function to run the initializers.\n\
|
|
|
|
# Load the parameters:\n\
|
|
|
|
# (%r2, %r3, %r4, %r5) = (_dl_loaded, argc, argv, envp)\n\
|
2002-02-28 22:38:00 +00:00
|
|
|
l %r2,_rtld_local@GOT(%r12)\n\
|
2000-08-02 15:15:00 +00:00
|
|
|
l %r2,0(%r2)\n\
|
|
|
|
l %r3,96(%r15)\n\
|
|
|
|
la %r4,100(%r15)\n\
|
|
|
|
lr %r5,%r3\n\
|
|
|
|
sll %r5,2\n\
|
|
|
|
la %r5,104(%r5,%r15)\n\
|
|
|
|
l %r1,.Ladr4-.Llit(%r13)\n\
|
|
|
|
bas %r14,0(%r1,%r13)\n\
|
|
|
|
# Pass our finalizer function to the user in %r14, as per ELF ABI.\n\
|
|
|
|
l %r14,_dl_fini@GOT(%r12)\n\
|
|
|
|
# Free stack frame\n\
|
|
|
|
ahi %r15,96\n\
|
|
|
|
# Jump to the user's entry point (saved in %r8).\n\
|
|
|
|
br %r8\n\
|
|
|
|
.Llit:\n\
|
|
|
|
.Ladr0: .long _GLOBAL_OFFSET_TABLE_-.Llit\n\
|
|
|
|
.Ladr1: .long _dl_start-.Llit\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
|
|
|
.Ladr4: .long _dl_init_internal@PLT-.Llit\n\
|
2000-08-02 15:15:00 +00:00
|
|
|
");
|
|
|
|
|
|
|
|
#ifndef RTLD_START_SPECIAL_INIT
|
|
|
|
#define RTLD_START_SPECIAL_INIT /* nothing */
|
|
|
|
#endif
|
|
|
|
|
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_390_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
|
|
|
| (((type) == R_390_COPY) * ELF_RTYPE_CLASS_COPY))
|
2000-08-02 15:15:00 +00:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
#define ELF_MACHINE_JMP_SLOT R_390_JMP_SLOT
|
|
|
|
|
|
|
|
/* The S390 never uses Elf32_Rel relocations. */
|
|
|
|
#define ELF_MACHINE_NO_REL 1
|
|
|
|
|
|
|
|
/* The S390 overlaps DT_RELA and DT_PLTREL. */
|
|
|
|
#define ELF_MACHINE_PLTREL_OVERLAP 1
|
|
|
|
|
|
|
|
/* 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-08-02 15:15:00 +00:00
|
|
|
/* Avoid an empty string which would disturb us. */
|
2002-02-01 01:33:04 +00:00
|
|
|
GL(dl_platform) = NULL;
|
2000-08-02 15:15:00 +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;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef RESOLVE
|
|
|
|
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
MAP is the object containing the reloc. */
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
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_390_RELATIVE, 0))
|
|
|
|
*reloc_addr = map->l_addr + reloc->r_addend;
|
2000-08-02 15:15:00 +00:00
|
|
|
#ifndef RTLD_BOOTSTRAP
|
2001-08-24 08:53:35 +00:00
|
|
|
else if (__builtin_expect (r_type == R_390_NONE, 0))
|
|
|
|
return;
|
2000-08-02 15:15:00 +00:00
|
|
|
#endif
|
2001-08-24 08:53:35 +00:00
|
|
|
else
|
2000-08-02 15:15:00 +00:00
|
|
|
{
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
2001-08-24 08:53:35 +00:00
|
|
|
Elf32_Addr value = RESOLVE (&sym, version, r_type);
|
2000-08-02 15:15:00 +00:00
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
switch (r_type)
|
2000-08-02 15:15:00 +00:00
|
|
|
{
|
2001-12-29 00:33:04 +00:00
|
|
|
case R_390_GLOB_DAT:
|
|
|
|
case R_390_JMP_SLOT:
|
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
2000-08-02 15:15:00 +00:00
|
|
|
case R_390_COPY:
|
|
|
|
if (sym == NULL)
|
|
|
|
/* This can happen in trace mode if an object could not be
|
|
|
|
found. */
|
|
|
|
break;
|
|
|
|
if (__builtin_expect (sym->st_size > refsym->st_size, 0)
|
|
|
|
|| (__builtin_expect (sym->st_size < refsym->st_size, 0)
|
2002-02-01 01:33:04 +00:00
|
|
|
&& __builtin_expect (GL(dl_verbose), 0)))
|
2000-08-02 15:15:00 +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 ("\
|
|
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
|
|
|
_dl_argv[0] ?: "<program name unknown>",
|
|
|
|
strtab + refsym->st_name);
|
2000-08-02 15:15:00 +00:00
|
|
|
}
|
|
|
|
memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
|
|
|
|
refsym->st_size));
|
|
|
|
break;
|
|
|
|
case R_390_32:
|
2001-12-29 00:33:04 +00:00
|
|
|
*reloc_addr = value + reloc->r_addend;
|
|
|
|
break;
|
|
|
|
case R_390_16:
|
|
|
|
*(unsigned short *) reloc_addr = value + reloc->r_addend;
|
|
|
|
break;
|
|
|
|
case R_390_8:
|
|
|
|
*(char *) reloc_addr = value + reloc->r_addend;
|
|
|
|
break;
|
2000-08-02 15:15:00 +00:00
|
|
|
case R_390_PC32:
|
2001-03-10 06:42:38 +00:00
|
|
|
*reloc_addr = value + reloc->r_addend - (Elf32_Addr) reloc_addr;
|
2000-08-02 15:15:00 +00:00
|
|
|
break;
|
2001-12-29 00:33:04 +00:00
|
|
|
case R_390_PC16DBL:
|
|
|
|
case R_390_PLT16DBL:
|
|
|
|
*(unsigned short *) reloc_addr = (unsigned short)
|
|
|
|
((short) (value + reloc->r_addend - (Elf32_Addr) reloc_addr) >> 1);
|
|
|
|
break;
|
|
|
|
case R_390_PC16:
|
|
|
|
*(unsigned short *) reloc_addr =
|
|
|
|
value + reloc->r_addend - (Elf32_Addr) reloc_addr;
|
|
|
|
break;
|
2000-08-02 15:15:00 +00:00
|
|
|
case R_390_NONE:
|
|
|
|
break;
|
2001-12-29 00:33:04 +00:00
|
|
|
#endif
|
|
|
|
#if !defined(RTLD_BOOTSTRAP) || defined(_NDEBUG)
|
2000-08-02 15:15:00 +00:00
|
|
|
default:
|
2001-12-29 00:33:04 +00:00
|
|
|
/* We add these checks in the version to relocate ld.so only
|
|
|
|
if we are still debugging. */
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
2000-08-02 15:15:00 +00:00
|
|
|
break;
|
2001-12-29 00:33:04 +00:00
|
|
|
#endif
|
2000-08-02 15:15:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
static inline void
|
2001-08-26 08:15:36 +00:00
|
|
|
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr *const reloc_addr)
|
2001-08-24 08:53:35 +00:00
|
|
|
{
|
|
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
|
|
}
|
2000-08-02 15:15:00 +00:00
|
|
|
|
|
|
|
static inline void
|
|
|
|
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);
|
2001-08-24 08:53:35 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
2000-08-02 15:15:00 +00:00
|
|
|
/* Check for unexpected PLT reloc type. */
|
2001-08-26 17:37:42 +00:00
|
|
|
if (__builtin_expect (r_type == R_390_JMP_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
|
|
|
|
+ (((Elf32_Addr) reloc_addr) - map->l_mach.gotplt) * 8;
|
|
|
|
}
|
2000-08-02 15:15:00 +00:00
|
|
|
else
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
2000-08-02 15:15:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|