2001-04-10 03:10:20 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. CRIS version.
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
|
2001-04-10 03:10:20 +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.
|
2001-04-10 03:10:20 +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.
|
2001-04-10 03:10:20 +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. */
|
2001-04-10 03:10:20 +00:00
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "CRIS"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
#ifdef __PIC__
|
|
|
|
# define CALL_FN(x) \
|
|
|
|
"move.d $pc,$r9\n\t" \
|
|
|
|
"add.d " #x " - .,$r9\n\t" \
|
|
|
|
"jsr $r9"
|
|
|
|
#else
|
|
|
|
# define CALL_FN(x) "jsr " #x
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
|
|
|
{
|
|
|
|
return ehdr->e_machine == EM_CRIS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
|
|
|
/* Don't just set this to an asm variable "r0" since that's not logical
|
|
|
|
(like, the variable is uninitialized and the register is fixed) and
|
|
|
|
may make GCC trip over itself doing register allocation. Yes, I'm
|
|
|
|
paranoid. Why do you ask? */
|
|
|
|
Elf32_Addr *got;
|
|
|
|
|
|
|
|
__asm__ ("move.d $r0,%0" : "=rm" (got));
|
|
|
|
return *got;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. We do it like
|
|
|
|
m68k and i386, by taking an arbitrary local symbol, forcing a GOT entry
|
|
|
|
for it, and peeking into the GOT table, which is set to the link-time
|
|
|
|
file-relative symbol value (regardless of whether the target is REL or
|
|
|
|
RELA). We subtract this link-time file-relative value from the "local"
|
|
|
|
value we calculate from GOT position and GOT offset. FIXME: Perhaps
|
|
|
|
there's some other symbol we could use, that we don't *have* to force a
|
|
|
|
GOT entry for. */
|
|
|
|
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
|
|
|
Elf32_Addr gotaddr_diff;
|
|
|
|
__asm__ ("sub.d [$r0+_dl_start:GOT16],$r0,%0\n\t"
|
|
|
|
"add.d _dl_start:GOTOFF,%0" : "=r" (gotaddr_diff));
|
|
|
|
return gotaddr_diff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|
|
|
{
|
|
|
|
Elf32_Addr *got;
|
|
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
|
|
|
extern void _dl_runtime_profile (Elf32_Word);
|
|
|
|
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
{
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been
|
|
|
|
filled in. Their initial contents will arrange when called
|
|
|
|
to push an offset into the .rela.plt section, push
|
|
|
|
_GLOBAL_OFFSET_TABLE_[1], and then jump to
|
|
|
|
_GLOBAL_OFFSET_TABLE_[2]. */
|
|
|
|
got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
|
|
|
|
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))
|
2001-04-10 03:10:20 +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;
|
2001-04-10 03:10:20 +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.
|
|
|
|
|
|
|
|
We get here with the offset into the relocation table pushed on stack,
|
|
|
|
and the link map in MOF. */
|
|
|
|
|
|
|
|
#define TRAMPOLINE_TEMPLATE(tramp_name, fixup_name) \
|
2002-08-28 21:32:56 +00:00
|
|
|
"; Trampoline for " #fixup_name "\n\
|
|
|
|
.globl " #tramp_name "\n\
|
|
|
|
.type " #tramp_name ", @function\n\
|
|
|
|
" #tramp_name ":\n\
|
|
|
|
push $r13\n\
|
|
|
|
push $r12\n\
|
|
|
|
push $r11\n\
|
|
|
|
push $r10\n\
|
|
|
|
push $r9\n\
|
|
|
|
push $srp\n\
|
|
|
|
move.d [$sp+6*4],$r11\n\
|
|
|
|
move $mof,$r10\n\
|
|
|
|
" CALL_FN (fixup_name) "\n\
|
|
|
|
move.d $r10,[$sp+6*4]\n\
|
|
|
|
pop $srp\n\
|
|
|
|
pop $r9\n\
|
|
|
|
pop $r10\n\
|
|
|
|
pop $r11\n\
|
|
|
|
pop $r12\n\
|
|
|
|
pop $r13\n\
|
|
|
|
jump [$sp+]\n\
|
2001-04-10 03:10:20 +00:00
|
|
|
.size " #tramp_name ", . - " #tramp_name "\n"
|
|
|
|
#ifndef PROF
|
|
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
|
|
|
|
asm (TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup) \
|
|
|
|
TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup));
|
|
|
|
#else
|
|
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
|
|
|
|
asm (TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup) \
|
|
|
|
".globl _dl_runtime_profile\n" \
|
|
|
|
".set _dl_runtime_profile, _dl_runtime_resolve");
|
|
|
|
#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 ("\
|
2002-08-28 21:32:56 +00:00
|
|
|
.text\n\
|
|
|
|
.globl _start\n\
|
|
|
|
.type _start,@function\n\
|
|
|
|
_start:\n\
|
|
|
|
move.d $sp,$r10\n\
|
|
|
|
" CALL_FN (_dl_start) "\n\
|
|
|
|
/* FALLTHRU */\n\
|
|
|
|
\n\
|
|
|
|
.globl _dl_start_user\n\
|
|
|
|
.type _dl_start_user,@function\n\
|
|
|
|
_dl_start_user:\n\
|
|
|
|
; Save the user entry point address in R1.\n\
|
|
|
|
move.d $r10,$r1\n\
|
|
|
|
; Point R0 at the GOT.\n\
|
|
|
|
move.d $pc,$r0\n\
|
|
|
|
sub.d .:GOTOFF,$r0\n\
|
|
|
|
; See if we were run as a command with the executable file\n\
|
|
|
|
; name as an extra leading argument.\n\
|
|
|
|
move.d [$r0+_dl_skip_args:GOT16],$r13\n\
|
|
|
|
move.d [$r13],$r9\n\
|
|
|
|
; Get the original argument count\n\
|
|
|
|
move.d [$sp],$r11\n\
|
|
|
|
; Subtract _dl_skip_args from it.\n\
|
|
|
|
sub.d $r9,$r11\n\
|
|
|
|
; Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
|
|
addi $r9.d,$sp\n\
|
|
|
|
; Put the new argc in place as expected by the user entry.\n\
|
|
|
|
move.d $r11,[$sp]\n\
|
|
|
|
; Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\
|
|
|
|
; env: skip scaled argc and skip stored argc and NULL at end of argv[].\n\
|
|
|
|
move.d $sp,$r13\n\
|
|
|
|
addi $r11.d,$r13\n\
|
|
|
|
addq 8,$r13\n\
|
|
|
|
; argv: skip stored argc.\n\
|
|
|
|
move.d $sp,$r12\n\
|
|
|
|
addq 4,$r12\n\
|
|
|
|
; main_map: at _dl_loaded.\n\
|
|
|
|
move.d [$r0+_rtld_local:GOT16],$r9\n\
|
|
|
|
move.d [$r9],$r10\n\
|
|
|
|
move.d _dl_init_internal:PLTG,$r9\n\
|
|
|
|
add.d $r0,$r9\n\
|
|
|
|
jsr $r9\n\
|
|
|
|
; Pass our finalizer function to the user in R10.\n\
|
|
|
|
move.d [$r0+_dl_fini:GOT16],$r10\n\
|
|
|
|
; Terminate the frame-pointer.\n\
|
|
|
|
moveq 0,$r8\n\
|
|
|
|
; Cause SEGV if user entry returns.\n\
|
|
|
|
move $r8,$srp\n\
|
|
|
|
; Jump to the user's entry point.\n\
|
|
|
|
jump $r1\n\
|
|
|
|
.size _dl_start_user, . - _dl_start_user\n\
|
2001-04-10 03:10:20 +00:00
|
|
|
.previous");
|
|
|
|
|
2003-09-17 02:47:48 +00:00
|
|
|
/* The union of reloc-type-classes where the reloc TYPE is a member.
|
|
|
|
|
|
|
|
TYPE is in the class ELF_RTYPE_CLASS_PLT if it can describe a
|
|
|
|
relocation for a PLT entry, that is, for which a PLT entry should not
|
|
|
|
be allowed to define the value. The GNU linker for CRIS can merge a
|
|
|
|
.got.plt entry (R_CRIS_JUMP_SLOT) with a .got entry (R_CRIS_GLOB_DAT),
|
|
|
|
so we need to match both these reloc types.
|
|
|
|
|
|
|
|
TYPE is in the class ELF_RTYPE_CLASS_NOCOPY if it 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_CRIS_JUMP_SLOT)) \
|
|
|
|
|| ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \
|
2001-08-26 22:28:16 +00:00
|
|
|
| (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
|
2001-04-10 03:10:20 +00:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
#define ELF_MACHINE_JMP_SLOT R_CRIS_JUMP_SLOT
|
|
|
|
|
|
|
|
/* CRIS never uses Elf32_Rel relocations. */
|
|
|
|
#define ELF_MACHINE_NO_REL 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')
|
2001-04-10 03:10:20 +00:00
|
|
|
/* Avoid an empty string which would disturb us. */
|
2002-02-01 01:33:04 +00:00
|
|
|
GL(dl_platform) = NULL;
|
2001-04-10 03:10:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
|
|
|
const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
|
|
|
return *reloc_addr = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the final value of a plt relocation. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr value)
|
|
|
|
{
|
|
|
|
return value + reloc->r_addend;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
|
|
|
|
#ifdef RESOLVE
|
|
|
|
|
|
|
|
/* 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,
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
void *const reloc_addr_arg)
|
2001-04-10 03:10:20 +00:00
|
|
|
{
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-08-24 08:53:35 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
2001-04-10 03:10:20 +00:00
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
if (__builtin_expect (r_type == R_CRIS_RELATIVE, 0))
|
|
|
|
*reloc_addr = map->l_addr + reloc->r_addend;
|
2001-04-10 03:10:20 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
|
|
|
#endif
|
|
|
|
Elf32_Addr value;
|
2001-08-24 08:53:35 +00:00
|
|
|
if (sym->st_shndx != SHN_UNDEF
|
|
|
|
&& ELF32_ST_BIND (sym->st_info) == STB_LOCAL)
|
2001-04-10 03:10:20 +00:00
|
|
|
value = map->l_addr;
|
|
|
|
else
|
|
|
|
{
|
2001-08-24 08:53:35 +00:00
|
|
|
value = RESOLVE (&sym, version, r_type);
|
2001-04-10 03:10:20 +00:00
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
}
|
|
|
|
value += reloc->r_addend; /* Assume copy relocs have zero addend. */
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
switch (r_type)
|
2001-04-10 03:10:20 +00:00
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
case R_CRIS_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))
|
2001-04-10 03:10:20 +00:00
|
|
|
{
|
|
|
|
const char *strtab;
|
|
|
|
|
|
|
|
strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
|
|
|
_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-04-10 03:10:20 +00:00
|
|
|
strtab + refsym->st_name);
|
|
|
|
}
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
memcpy (reloc_addr_arg, (void *) value,
|
|
|
|
MIN (sym->st_size, refsym->st_size));
|
2001-04-10 03:10:20 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_CRIS_32:
|
|
|
|
#endif
|
|
|
|
case R_CRIS_GLOB_DAT:
|
|
|
|
case R_CRIS_JUMP_SLOT:
|
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
case R_CRIS_8:
|
|
|
|
*(char *) reloc_addr = value;
|
|
|
|
break;
|
|
|
|
case R_CRIS_16:
|
|
|
|
*(short *) reloc_addr = value;
|
|
|
|
break;
|
|
|
|
case R_CRIS_8_PCREL:
|
|
|
|
*(char *) reloc_addr
|
|
|
|
= value + reloc->r_addend - (Elf32_Addr) reloc_addr - 1;
|
|
|
|
break;
|
|
|
|
case R_CRIS_16_PCREL:
|
|
|
|
*(short *) reloc_addr
|
|
|
|
= value + reloc->r_addend - (Elf32_Addr) reloc_addr - 2;
|
|
|
|
break;
|
|
|
|
case R_CRIS_32_PCREL:
|
|
|
|
*reloc_addr = value + reloc->r_addend - (Elf32_Addr) reloc_addr - 4;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
case R_CRIS_NONE:
|
|
|
|
break;
|
|
|
|
#if !defined RTLD_BOOTSTRAP || defined _NDEBUG
|
|
|
|
default:
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
2001-04-10 03:10:20 +00:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-08-24 08:53:35 +00:00
|
|
|
static inline void
|
2001-08-24 14:58:03 +00:00
|
|
|
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
void *const reloc_addr_arg)
|
2001-08-24 08:53:35 +00:00
|
|
|
{
|
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Don't assume reloc_addr is aligned. * sysdeps/alpha/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/cris/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/hppa/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative): Adjust. * sysdeps/ia64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/m68k/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/mips/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela_relative, elf_machine_rela): Adjust. * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): * sysdeps/sh/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust. * sysdeps/x86_64/dl-machine.h (elf_machine_rela, elf_machine_rela_relative): Adjust.
2003-07-31 Alexandre Oliva <aoliva@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Don't assume
reloc_addr is aligned.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/cris/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/hppa/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela,
elf_machine_rel_relative, elf_machine_rela_relative): Adjust.
* sysdeps/ia64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/m68k/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/mips/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rela_relative, elf_machine_rela): Adjust.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative):
* sysdeps/sh/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative): Adjust.
2003-07-31 06:33:53 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-08-24 08:53:35 +00:00
|
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
|
|
}
|
|
|
|
|
2001-04-10 03:10:20 +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);
|
|
|
|
if (__builtin_expect (r_type == R_CRIS_JUMP_SLOT, 1))
|
2001-04-10 03:10:20 +00:00
|
|
|
*reloc_addr += l_addr;
|
|
|
|
else
|
2001-08-24 08:53:35 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
2001-04-10 03:10:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|