1998-03-18 14:28:36 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
|
2019-01-01 00:11:28 +00:00
|
|
|
Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
1998-03-18 14:28:36 +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:56:23 +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:28:36 +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:56:23 +00:00
|
|
|
Lesser General Public License for more details.
|
1998-03-18 14:28:36 +00:00
|
|
|
|
2001-07-06 04:56:23 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-03-09 23:56:38 +00:00
|
|
|
License along with the GNU C Library. If not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1998-03-18 14:28:36 +00:00
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "ARM"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
#include <tls.h>
|
2011-03-05 03:39:15 +00:00
|
|
|
#include <dl-tlsdesc.h>
|
2012-05-25 16:07:05 +00:00
|
|
|
#include <dl-irel.h>
|
1998-03-18 14:28:36 +00:00
|
|
|
|
2012-08-01 18:39:08 +00:00
|
|
|
#ifndef CLEAR_CACHE
|
|
|
|
# error CLEAR_CACHE definition required to handle TEXTREL
|
|
|
|
#endif
|
1999-12-18 23:40:50 +00:00
|
|
|
|
2000-10-20 17:04:28 +00:00
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
1998-03-18 14:28:36 +00:00
|
|
|
static inline int __attribute__ ((unused))
|
2000-10-20 17:04:28 +00:00
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
2000-10-20 17:04:28 +00:00
|
|
|
return ehdr->e_machine == EM_ARM;
|
1998-03-18 14:28:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
2013-05-07 17:29:13 +00:00
|
|
|
first element of the GOT. */
|
1998-03-18 14:28:36 +00:00
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
elf_machine_dynamic (void)
|
|
|
|
{
|
2013-05-07 17:29:13 +00:00
|
|
|
/* Declaring this hidden ensures that a PC-relative reference is used. */
|
|
|
|
extern const Elf32_Addr _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
|
|
|
|
return _GLOBAL_OFFSET_TABLE_[0];
|
1998-03-18 14:28:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
2017-09-29 23:23:18 +00:00
|
|
|
Elf32_Addr pcrel_addr;
|
|
|
|
#ifdef SHARED
|
2017-08-31 14:59:37 +00:00
|
|
|
extern Elf32_Addr __dl_start (void *) asm ("_dl_start");
|
1999-06-06 09:20:55 +00:00
|
|
|
Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
|
2017-07-13 14:48:41 +00:00
|
|
|
asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
|
2017-09-29 23:23:18 +00:00
|
|
|
#else
|
|
|
|
extern Elf32_Addr __dl_relocate_static_pie (void *)
|
|
|
|
asm ("_dl_relocate_static_pie") attribute_hidden;
|
|
|
|
Elf32_Addr got_addr = (Elf32_Addr) &__dl_relocate_static_pie;
|
|
|
|
asm ("adr %0, _dl_relocate_static_pie" : "=r" (pcrel_addr));
|
|
|
|
#endif
|
2009-02-05 14:46:41 +00:00
|
|
|
#ifdef __thumb__
|
2017-07-13 14:48:41 +00:00
|
|
|
/* Clear the low bit of the function address.
|
|
|
|
|
|
|
|
NOTE: got_addr is from GOT table whose lsb is always set by linker if it's
|
|
|
|
Thumb function address. PCREL_ADDR comes from PC-relative calculation
|
|
|
|
which will finish during assembling. GAS assembler before the fix for
|
|
|
|
PR gas/21458 was not setting the lsb but does after that. Always do the
|
|
|
|
strip for both, so the code works with various combinations of glibc and
|
|
|
|
Binutils. */
|
2009-02-05 14:46:41 +00:00
|
|
|
got_addr &= ~(Elf32_Addr) 1;
|
2017-07-13 14:48:41 +00:00
|
|
|
pcrel_addr &= ~(Elf32_Addr) 1;
|
2009-02-05 14:46:41 +00:00
|
|
|
#endif
|
1999-06-06 09:20:55 +00:00
|
|
|
return pcrel_addr - got_addr;
|
1998-03-18 14:28:36 +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:19 +00:00
|
|
|
got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
|
2001-12-12 00:11:47 +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:28:36 +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:23 +00:00
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
2001-08-11 08:54:29 +00:00
|
|
|
|
2005-06-10 11:33:52 +00:00
|
|
|
if (GLRO(dl_profile) != NULL
|
|
|
|
&& _dl_name_match_p (GLRO(dl_profile), l))
|
2001-08-11 08:54:29 +00:00
|
|
|
/* Say that we really want profiling and the timers are
|
|
|
|
started. */
|
2002-02-01 01:32:06 +00:00
|
|
|
GL(dl_profile_map) = l;
|
1998-03-18 14:28:36 +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;
|
|
|
|
}
|
2011-03-05 03:39:15 +00:00
|
|
|
|
1998-03-18 14:28:36 +00:00
|
|
|
return lazy;
|
|
|
|
}
|
|
|
|
|
2013-02-27 21:33:09 +00:00
|
|
|
#if defined(ARCH_HAS_BX)
|
2003-09-17 18:09:25 +00:00
|
|
|
#define BX(x) "bx\t" #x
|
1998-03-18 14:28:36 +00:00
|
|
|
#else
|
2003-09-17 18:09:25 +00:00
|
|
|
#define BX(x) "mov\tpc, " #x
|
1998-03-18 14:28:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
|
|
where the dynamic linker should not map anything. */
|
|
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 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:26:20 +00:00
|
|
|
.text\n\
|
|
|
|
.globl _start\n\
|
2009-02-05 14:46:41 +00:00
|
|
|
.type _start, %function\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
.globl _dl_start_user\n\
|
2009-02-05 14:46:41 +00:00
|
|
|
.type _dl_start_user, %function\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
_start:\n\
|
2004-04-29 20:06:49 +00:00
|
|
|
@ we are PIC code, so get global offset table\n\
|
|
|
|
ldr sl, .L_GET_GOT\n\
|
|
|
|
@ See if we were run as a command with the executable file\n\
|
|
|
|
@ name as an extra leading argument.\n\
|
|
|
|
ldr r4, .L_SKIP_ARGS\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
@ at start time, all the args are on the stack\n\
|
|
|
|
mov r0, sp\n\
|
|
|
|
bl _dl_start\n\
|
|
|
|
@ returns user entry point in r0\n\
|
|
|
|
_dl_start_user:\n\
|
2009-02-05 14:46:41 +00:00
|
|
|
adr r6, .L_GET_GOT\n\
|
|
|
|
add sl, sl, r6\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
ldr r4, [sl, r4]\n\
|
2004-04-29 20:06:49 +00:00
|
|
|
@ save the entry point in another register\n\
|
|
|
|
mov r6, r0\n\
|
2005-10-10 15:29:32 +00:00
|
|
|
@ get the original arg count\n\
|
|
|
|
ldr r1, [sp]\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
@ get the argv address\n\
|
|
|
|
add r2, sp, #4\n\
|
2005-10-10 15:29:32 +00:00
|
|
|
@ Fix up the stack if necessary.\n\
|
|
|
|
cmp r4, #0\n\
|
|
|
|
bne .L_fixup_stack\n\
|
|
|
|
.L_done_fixup:\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
@ compute envp\n\
|
|
|
|
add r3, r2, r1, lsl #2\n\
|
|
|
|
add r3, r3, #4\n\
|
|
|
|
@ now we call _dl_init\n\
|
|
|
|
ldr r0, .L_LOADED\n\
|
|
|
|
ldr r0, [sl, r0]\n\
|
|
|
|
@ call _dl_init\n\
|
2014-11-04 23:26:39 +00:00
|
|
|
bl _dl_init(PLT)\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
@ load the finalizer function\n\
|
|
|
|
ldr r0, .L_FINI_PROC\n\
|
2004-04-29 20:06:49 +00:00
|
|
|
add r0, sl, r0\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
@ jump to the user_s entry point\n\
|
2004-12-04 21:20:17 +00:00
|
|
|
" BX(r6) "\n\
|
2005-10-10 15:29:32 +00:00
|
|
|
\n\
|
|
|
|
@ iWMMXt and EABI targets require the stack to be eight byte\n\
|
|
|
|
@ aligned - shuffle arguments etc.\n\
|
|
|
|
.L_fixup_stack:\n\
|
|
|
|
@ subtract _dl_skip_args from original arg count\n\
|
|
|
|
sub r1, r1, r4\n\
|
|
|
|
@ store the new argc in the new stack location\n\
|
|
|
|
str r1, [sp]\n\
|
|
|
|
@ find the first unskipped argument\n\
|
|
|
|
mov r3, r2\n\
|
|
|
|
add r4, r2, r4, lsl #2\n\
|
|
|
|
@ shuffle argv down\n\
|
|
|
|
1: ldr r5, [r4], #4\n\
|
|
|
|
str r5, [r3], #4\n\
|
|
|
|
cmp r5, #0\n\
|
|
|
|
bne 1b\n\
|
|
|
|
@ shuffle envp down\n\
|
|
|
|
1: ldr r5, [r4], #4\n\
|
|
|
|
str r5, [r3], #4\n\
|
|
|
|
cmp r5, #0\n\
|
|
|
|
bne 1b\n\
|
|
|
|
@ shuffle auxv down\n\
|
|
|
|
1: ldmia r4!, {r0, r5}\n\
|
|
|
|
stmia r3!, {r0, r5}\n\
|
|
|
|
cmp r0, #0\n\
|
|
|
|
bne 1b\n\
|
|
|
|
@ Update _dl_argv\n\
|
|
|
|
ldr r3, .L_ARGV\n\
|
|
|
|
str r2, [sl, r3]\n\
|
|
|
|
b .L_done_fixup\n\
|
|
|
|
\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
.L_GET_GOT:\n\
|
2009-02-05 14:46:41 +00:00
|
|
|
.word _GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
.L_SKIP_ARGS:\n\
|
|
|
|
.word _dl_skip_args(GOTOFF)\n\
|
|
|
|
.L_FINI_PROC:\n\
|
2004-04-29 20:06:49 +00:00
|
|
|
.word _dl_fini(GOTOFF)\n\
|
2005-10-10 15:29:32 +00:00
|
|
|
.L_ARGV:\n\
|
|
|
|
.word _dl_argv(GOTOFF)\n\
|
2002-08-28 21:26:20 +00:00
|
|
|
.L_LOADED:\n\
|
2004-04-29 20:06:49 +00:00
|
|
|
.word _rtld_local(GOTOFF)\n\
|
1998-03-18 14:28:36 +00:00
|
|
|
.previous\n\
|
|
|
|
");
|
|
|
|
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
|
|
|
|
TLS variable, so undefined references should not be allowed to
|
|
|
|
define the value.
|
2015-03-05 16:26:21 +00:00
|
|
|
ELF_RTYPE_CLASS_COPY iff TYPE should not be allowed to resolve to one
|
2015-07-24 09:05:07 +00:00
|
|
|
of the main executable's symbols, as for a COPY reloc.
|
|
|
|
ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA iff TYPE describes relocation against
|
|
|
|
protected data whose address may be external due to copy relocation. */
|
2011-10-26 16:16:52 +00:00
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
# define elf_machine_type_class(type) \
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
((((type) == R_ARM_JUMP_SLOT || (type) == R_ARM_TLS_DTPMOD32 \
|
2011-03-05 03:39:15 +00:00
|
|
|
|| (type) == R_ARM_TLS_DTPOFF32 || (type) == R_ARM_TLS_TPOFF32 \
|
|
|
|
|| (type) == R_ARM_TLS_DESC) \
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
* ELF_RTYPE_CLASS_PLT) \
|
2015-07-24 09:05:07 +00:00
|
|
|
| (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY) \
|
|
|
|
| (((type) == R_ARM_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA))
|
2011-10-26 16:16:52 +00:00
|
|
|
#else
|
|
|
|
#define elf_machine_type_class(type) \
|
|
|
|
((((type) == R_ARM_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
2015-07-24 09:05:07 +00:00
|
|
|
| (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY) \
|
|
|
|
| (((type) == R_ARM_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA))
|
2011-10-26 16:16:52 +00:00
|
|
|
#endif
|
1998-03-18 14:28:36 +00:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
1998-06-09 15:13:18 +00:00
|
|
|
#define ELF_MACHINE_JMP_SLOT R_ARM_JUMP_SLOT
|
1998-03-18 14:28:36 +00:00
|
|
|
|
2001-12-12 00:11:47 +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:28:36 +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)
|
|
|
|
{
|
2004-03-05 10:22:54 +00:00
|
|
|
if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
|
2000-01-10 01:42:43 +00:00
|
|
|
/* Avoid an empty string which would disturb us. */
|
2004-03-05 10:22:54 +00:00
|
|
|
GLRO(dl_platform) = NULL;
|
1998-03-18 14:28:36 +00:00
|
|
|
}
|
|
|
|
|
2000-05-05 07:12:09 +00:00
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
2017-06-14 01:17:25 +00:00
|
|
|
const ElfW(Sym) *refsym, const ElfW(Sym) *sym,
|
2000-05-05 07:12:09 +00:00
|
|
|
const Elf32_Rel *reloc,
|
1998-03-18 14:28:36 +00:00
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
2000-05-05 07:12:09 +00:00
|
|
|
return *reloc_addr = value;
|
1998-03-18 14:28:36 +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 */
|
|
|
|
|
|
|
|
|
2001-12-12 00:11:47 +00:00
|
|
|
/* ARM never uses Elf32_Rela relocations for the dynamic linker.
|
|
|
|
Prelinked libraries may use Elf32_Rela though. */
|
2005-03-06 00:07:58 +00:00
|
|
|
#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
|
2014-07-03 09:50:50 +00:00
|
|
|
#define ELF_MACHINE_NO_REL 0
|
2005-03-01 20:34:40 +00:00
|
|
|
|
2005-10-05 20:13:03 +00:00
|
|
|
/* Names of the architecture-specific auditing callback functions. */
|
|
|
|
#define ARCH_LA_PLTENTER arm_gnu_pltenter
|
|
|
|
#define ARCH_LA_PLTEXIT arm_gnu_pltexit
|
|
|
|
|
2005-06-10 11:33:52 +00:00
|
|
|
#ifdef RESOLVE_MAP
|
2012-10-05 16:39:23 +00:00
|
|
|
/* Handle a PC24 reloc, including the out-of-range case. */
|
|
|
|
auto void
|
|
|
|
relocate_pc24 (struct link_map *map, Elf32_Addr value,
|
|
|
|
Elf32_Addr *const reloc_addr, Elf32_Sword addend)
|
2000-07-29 19:32:27 +00:00
|
|
|
{
|
2012-10-05 16:39:23 +00:00
|
|
|
Elf32_Addr new_value;
|
|
|
|
|
|
|
|
/* Set NEW_VALUE based on V, and return true iff it overflows 24 bits. */
|
|
|
|
inline bool set_new_value (Elf32_Addr v)
|
|
|
|
{
|
|
|
|
new_value = v + addend - (Elf32_Addr) reloc_addr;
|
|
|
|
Elf32_Addr topbits = new_value & 0xfe000000;
|
|
|
|
return topbits != 0xfe000000 && topbits != 0x00000000;
|
|
|
|
}
|
2000-07-29 19:32:27 +00:00
|
|
|
|
2012-10-05 16:39:23 +00:00
|
|
|
if (set_new_value (value))
|
2000-07-29 19:32:27 +00:00
|
|
|
{
|
2012-10-05 16:39:23 +00:00
|
|
|
/* The PC-relative address doesn't fit in 24 bits! */
|
|
|
|
|
|
|
|
static void *fix_page;
|
|
|
|
static size_t fix_offset;
|
|
|
|
if (fix_page == NULL)
|
|
|
|
{
|
|
|
|
void *new_page = __mmap (NULL, GLRO(dl_pagesize),
|
|
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
|
|
MAP_PRIVATE | MAP_ANON, -1, 0);
|
|
|
|
if (new_page == MAP_FAILED)
|
|
|
|
_dl_signal_error (0, map->l_name, NULL,
|
|
|
|
"could not map page for fixup");
|
|
|
|
fix_page = new_page;
|
|
|
|
assert (fix_offset == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
Elf32_Word *fix_address = fix_page + fix_offset;
|
|
|
|
fix_address[0] = 0xe51ff004; /* ldr pc, [pc, #-4] */
|
|
|
|
fix_address[1] = value;
|
|
|
|
|
|
|
|
fix_offset += sizeof fix_address[0] * 2;
|
|
|
|
if (fix_offset >= GLRO(dl_pagesize))
|
|
|
|
{
|
|
|
|
fix_page = NULL;
|
|
|
|
fix_offset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (set_new_value ((Elf32_Addr) fix_address))
|
|
|
|
_dl_signal_error (0, map->l_name, NULL,
|
|
|
|
"R_ARM_PC24 relocation out of range");
|
2000-07-29 19:32:27 +00:00
|
|
|
}
|
|
|
|
|
2012-10-05 16:39:23 +00:00
|
|
|
*reloc_addr = (*reloc_addr & 0xff000000) | ((new_value >> 2) & 0x00ffffff);
|
2000-07-29 19:32:27 +00:00
|
|
|
}
|
|
|
|
|
1998-03-18 14:28:36 +00:00
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
MAP is the object containing the reloc. */
|
|
|
|
|
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Add inline keyword.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
attribute.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise. Change
static inline into auto inline.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
* sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Likewise.
2005-03-15 22:57:26 +00:00
|
|
|
auto inline void
|
|
|
|
__attribute__ ((always_inline))
|
1998-03-18 14:28:36 +00:00
|
|
|
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
2011-10-05 09:51:41 +00:00
|
|
|
void *const reloc_addr_arg, int skip_ifunc)
|
1998-03-18 14:28:36 +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 06:33:52 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-08-24 08:43:21 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
|
2002-07-15 02:07:00 +00:00
|
|
|
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
|
2001-08-24 08:43:21 +00:00
|
|
|
if (__builtin_expect (r_type == R_ARM_RELATIVE, 0))
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
2002-07-15 02:07:00 +00:00
|
|
|
# if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
|
|
|
|
/* 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. */
|
|
|
|
# ifndef SHARED
|
|
|
|
weak_extern (_dl_rtld_map);
|
|
|
|
# endif
|
|
|
|
if (map != &GL(dl_rtld_map)) /* Already done in rtld itself. */
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
1998-03-18 14:28:36 +00:00
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
}
|
2002-03-01 09:43:36 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
2001-08-24 08:43:21 +00:00
|
|
|
else if (__builtin_expect (r_type == R_ARM_NONE, 0))
|
|
|
|
return;
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
2001-08-24 08:43:21 +00:00
|
|
|
else
|
2002-07-15 02:07:00 +00:00
|
|
|
#endif
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
2005-06-10 11:33:52 +00:00
|
|
|
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
|
elf: Unify symbol address run-time calculation [BZ #19818]
Wrap symbol address run-time calculation into a macro and use it
throughout, replacing inline calculations.
There are a couple of variants, most of them different in a functionally
insignificant way. Most calculations are right following RESOLVE_MAP,
at which point either the map or the symbol returned can be checked for
validity as the macro sets either both or neither. In some places both
the symbol and the map has to be checked however.
My initial implementation therefore always checked both, however that
resulted in code larger by as much as 0.3%, as many places know from
elsewhere that no check is needed. I have decided the size growth was
unacceptable.
Having looked closer I realized that it's the map that is the culprit.
Therefore I have modified LOOKUP_VALUE_ADDRESS to accept an additional
boolean argument telling it to access the map without checking it for
validity. This in turn has brought quite nice results, with new code
actually being smaller for i686, and MIPS o32, n32 and little-endian n64
targets, unchanged in size for x86-64 and, unusually, marginally larger
for big-endian MIPS n64, as follows:
i686:
text data bss dec hex filename
152255 4052 192 156499 26353 ld-2.27.9000-base.so
152159 4052 192 156403 262f3 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/el:
text data bss dec hex filename
142906 4396 260 147562 2406a ld-2.27.9000-base.so
142890 4396 260 147546 2405a ld-2.27.9000-elf-symbol-value.so
MIPS/n32/el:
text data bss dec hex filename
142267 4404 260 146931 23df3 ld-2.27.9000-base.so
142171 4404 260 146835 23d93 ld-2.27.9000-elf-symbol-value.so
MIPS/n64/el:
text data bss dec hex filename
149835 7376 408 157619 267b3 ld-2.27.9000-base.so
149787 7376 408 157571 26783 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/eb:
text data bss dec hex filename
142870 4396 260 147526 24046 ld-2.27.9000-base.so
142854 4396 260 147510 24036 ld-2.27.9000-elf-symbol-value.so
MIPS/n32/eb:
text data bss dec hex filename
142019 4404 260 146683 23cfb ld-2.27.9000-base.so
141923 4404 260 146587 23c9b ld-2.27.9000-elf-symbol-value.so
MIPS/n64/eb:
text data bss dec hex filename
149763 7376 408 157547 2676b ld-2.27.9000-base.so
149779 7376 408 157563 2677b ld-2.27.9000-elf-symbol-value.so
x86-64:
text data bss dec hex filename
148462 6452 400 155314 25eb2 ld-2.27.9000-base.so
148462 6452 400 155314 25eb2 ld-2.27.9000-elf-symbol-value.so
[BZ #19818]
* sysdeps/generic/ldsodefs.h (LOOKUP_VALUE_ADDRESS): Add `set'
parameter.
(SYMBOL_ADDRESS): New macro.
[!ELF_FUNCTION_PTR_IS_SPECIAL] (DL_SYMBOL_ADDRESS): Use
SYMBOL_ADDRESS for symbol address calculation.
* elf/dl-runtime.c (_dl_fixup): Likewise.
(_dl_profile_fixup): Likewise.
* elf/dl-symaddr.c (_dl_symbol_address): Likewise.
* elf/rtld.c (dl_main): Likewise.
* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/hppa/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Likewise.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/ia64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/microblaze/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
(elf_machine_reloc): Likewise.
(elf_machine_got_rel): Likewise.
* sysdeps/mips/dl-trampoline.c (__dl_runtime_resolve): Likewise.
* sysdeps/nios2/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/riscv/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/sh/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/tile/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2018-04-04 22:09:37 +00:00
|
|
|
Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true);
|
1998-03-18 14:28:36 +00:00
|
|
|
|
2011-04-26 21:00:46 +00:00
|
|
|
if (sym != NULL
|
2011-10-05 09:51:41 +00:00
|
|
|
&& __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0)
|
|
|
|
&& __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)
|
|
|
|
&& __builtin_expect (!skip_ifunc, 1))
|
2012-05-25 16:07:05 +00:00
|
|
|
value = elf_ifunc_invoke (value);
|
2011-04-26 21:00:46 +00:00
|
|
|
|
2001-08-24 08:43:21 +00:00
|
|
|
switch (r_type)
|
1998-03-18 14:28:36 +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
|
2004-03-05 10:22:54 +00:00
|
|
|
|| (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
|
|
|
const char *strtab;
|
|
|
|
|
2000-03-31 05:16:19 +00:00
|
|
|
strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
2001-02-28 06:35:24 +00:00
|
|
|
_dl_error_printf ("\
|
|
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
2013-05-29 16:00:20 +00:00
|
|
|
RTLD_PROGNAME, strtab + refsym->st_name);
|
1998-03-18 14:28:36 +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 06:33:52 +00:00
|
|
|
memcpy (reloc_addr_arg, (void *) value,
|
|
|
|
MIN (sym->st_size, refsym->st_size));
|
1998-03-18 14:28:36 +00:00
|
|
|
break;
|
|
|
|
case R_ARM_GLOB_DAT:
|
1998-06-09 15:13:18 +00:00
|
|
|
case R_ARM_JUMP_SLOT:
|
2002-03-01 09:43:36 +00:00
|
|
|
# ifdef RTLD_BOOTSTRAP
|
1998-11-27 10:01:37 +00:00
|
|
|
/* Fix weak undefined references. */
|
1999-02-20 14:57:43 +00:00
|
|
|
if (sym != NULL && sym->st_value == 0)
|
1998-11-27 10:01:37 +00:00
|
|
|
*reloc_addr = 0;
|
|
|
|
else
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
1998-11-27 10:01:37 +00:00
|
|
|
*reloc_addr = value;
|
1998-03-18 14:28:36 +00:00
|
|
|
break;
|
1998-06-09 15:13:18 +00:00
|
|
|
case R_ARM_ABS32:
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
2012-01-01 07:36:32 +00:00
|
|
|
struct unaligned
|
|
|
|
{
|
|
|
|
Elf32_Addr x;
|
2012-08-15 01:38:15 +00:00
|
|
|
} __attribute__ ((packed, may_alias));
|
2002-03-01 09:43:36 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
1998-03-18 14:28:36 +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:43:36 +00:00
|
|
|
# ifndef SHARED
|
1998-03-18 14:28:36 +00:00
|
|
|
weak_extern (_dl_rtld_map);
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
2002-07-15 02:07:00 +00:00
|
|
|
if (map == &GL(dl_rtld_map))
|
1998-03-18 14:28:36 +00:00
|
|
|
/* Undo the relocation done here during bootstrapping.
|
|
|
|
Now we will relocate it anew, possibly using a
|
|
|
|
binding found in the user program or a loaded library
|
|
|
|
rather than the dynamic linker's built-in definitions
|
|
|
|
used while loading those libraries. */
|
elf: Unify symbol address run-time calculation [BZ #19818]
Wrap symbol address run-time calculation into a macro and use it
throughout, replacing inline calculations.
There are a couple of variants, most of them different in a functionally
insignificant way. Most calculations are right following RESOLVE_MAP,
at which point either the map or the symbol returned can be checked for
validity as the macro sets either both or neither. In some places both
the symbol and the map has to be checked however.
My initial implementation therefore always checked both, however that
resulted in code larger by as much as 0.3%, as many places know from
elsewhere that no check is needed. I have decided the size growth was
unacceptable.
Having looked closer I realized that it's the map that is the culprit.
Therefore I have modified LOOKUP_VALUE_ADDRESS to accept an additional
boolean argument telling it to access the map without checking it for
validity. This in turn has brought quite nice results, with new code
actually being smaller for i686, and MIPS o32, n32 and little-endian n64
targets, unchanged in size for x86-64 and, unusually, marginally larger
for big-endian MIPS n64, as follows:
i686:
text data bss dec hex filename
152255 4052 192 156499 26353 ld-2.27.9000-base.so
152159 4052 192 156403 262f3 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/el:
text data bss dec hex filename
142906 4396 260 147562 2406a ld-2.27.9000-base.so
142890 4396 260 147546 2405a ld-2.27.9000-elf-symbol-value.so
MIPS/n32/el:
text data bss dec hex filename
142267 4404 260 146931 23df3 ld-2.27.9000-base.so
142171 4404 260 146835 23d93 ld-2.27.9000-elf-symbol-value.so
MIPS/n64/el:
text data bss dec hex filename
149835 7376 408 157619 267b3 ld-2.27.9000-base.so
149787 7376 408 157571 26783 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/eb:
text data bss dec hex filename
142870 4396 260 147526 24046 ld-2.27.9000-base.so
142854 4396 260 147510 24036 ld-2.27.9000-elf-symbol-value.so
MIPS/n32/eb:
text data bss dec hex filename
142019 4404 260 146683 23cfb ld-2.27.9000-base.so
141923 4404 260 146587 23c9b ld-2.27.9000-elf-symbol-value.so
MIPS/n64/eb:
text data bss dec hex filename
149763 7376 408 157547 2676b ld-2.27.9000-base.so
149779 7376 408 157563 2677b ld-2.27.9000-elf-symbol-value.so
x86-64:
text data bss dec hex filename
148462 6452 400 155314 25eb2 ld-2.27.9000-base.so
148462 6452 400 155314 25eb2 ld-2.27.9000-elf-symbol-value.so
[BZ #19818]
* sysdeps/generic/ldsodefs.h (LOOKUP_VALUE_ADDRESS): Add `set'
parameter.
(SYMBOL_ADDRESS): New macro.
[!ELF_FUNCTION_PTR_IS_SPECIAL] (DL_SYMBOL_ADDRESS): Use
SYMBOL_ADDRESS for symbol address calculation.
* elf/dl-runtime.c (_dl_fixup): Likewise.
(_dl_profile_fixup): Likewise.
* elf/dl-symaddr.c (_dl_symbol_address): Likewise.
* elf/rtld.c (dl_main): Likewise.
* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/hppa/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Likewise.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/ia64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/microblaze/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
(elf_machine_reloc): Likewise.
(elf_machine_got_rel): Likewise.
* sysdeps/mips/dl-trampoline.c (__dl_runtime_resolve): Likewise.
* sysdeps/nios2/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/riscv/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/sh/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/tile/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2018-04-04 22:09:37 +00:00
|
|
|
value -= SYMBOL_ADDRESS (map, refsym, true);
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
2012-01-01 07:36:32 +00:00
|
|
|
/* Support relocations on mis-aligned offsets. */
|
|
|
|
((struct unaligned *) reloc_addr)->x += value;
|
1998-03-18 14:28:36 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-03-05 03:39:15 +00:00
|
|
|
case R_ARM_TLS_DESC:
|
|
|
|
{
|
2017-10-20 16:44:18 +00:00
|
|
|
struct tlsdesc *td = (struct tlsdesc *)reloc_addr;
|
2011-03-05 03:39:15 +00:00
|
|
|
|
|
|
|
# ifndef RTLD_BOOTSTRAP
|
|
|
|
if (! sym)
|
|
|
|
td->entry = _dl_tlsdesc_undefweak;
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
{
|
2014-06-20 19:08:03 +00:00
|
|
|
if (ELF32_R_SYM (reloc->r_info) == STN_UNDEF)
|
|
|
|
value = td->argument.value;
|
|
|
|
else
|
|
|
|
value = sym->st_value;
|
2011-03-05 03:39:15 +00:00
|
|
|
|
|
|
|
# ifndef RTLD_BOOTSTRAP
|
|
|
|
# ifndef SHARED
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
# else
|
|
|
|
if (!TRY_STATIC_TLS (map, sym_map))
|
|
|
|
{
|
|
|
|
td->argument.pointer
|
|
|
|
= _dl_make_tlsdesc_dynamic (sym_map, value);
|
|
|
|
td->entry = _dl_tlsdesc_dynamic;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
# endif
|
2011-10-05 09:51:41 +00:00
|
|
|
{
|
2011-03-05 03:39:15 +00:00
|
|
|
td->argument.value = value + sym_map->l_tls_offset;
|
|
|
|
td->entry = _dl_tlsdesc_return;
|
2011-10-05 09:51:41 +00:00
|
|
|
}
|
2011-03-05 03:39:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
1999-12-08 07:35:32 +00:00
|
|
|
case R_ARM_PC24:
|
2012-10-05 16:39:23 +00:00
|
|
|
relocate_pc24 (map, value, reloc_addr,
|
|
|
|
/* Sign-extend the 24-bit addend in the
|
|
|
|
instruction (which counts instructions), and
|
|
|
|
then shift it up two so as to count bytes. */
|
|
|
|
(((Elf32_Sword) *reloc_addr << 8) >> 8) << 2);
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
break;
|
2011-04-26 21:00:46 +00:00
|
|
|
#if !defined RTLD_BOOTSTRAP
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
case R_ARM_TLS_DTPMOD32:
|
|
|
|
/* Get the information from the link map returned by the
|
|
|
|
resolv function. */
|
|
|
|
if (sym_map != NULL)
|
|
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_TLS_DTPOFF32:
|
2006-09-21 18:21:19 +00:00
|
|
|
if (sym != NULL)
|
|
|
|
*reloc_addr += sym->st_value;
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_TLS_TPOFF32:
|
2006-09-21 18:21:19 +00:00
|
|
|
if (sym != NULL)
|
|
|
|
{
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
*reloc_addr += sym->st_value + sym_map->l_tls_offset;
|
|
|
|
}
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
break;
|
2011-04-26 21:00:46 +00:00
|
|
|
case R_ARM_IRELATIVE:
|
|
|
|
value = map->l_addr + *reloc_addr;
|
2019-11-29 16:55:22 +00:00
|
|
|
if (__glibc_likely (!skip_ifunc))
|
|
|
|
value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
|
2011-04-26 21:00:46 +00:00
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
#endif
|
1998-03-18 14:28:36 +00:00
|
|
|
default:
|
2001-08-24 08:43:21 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
1998-03-18 14:28:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-01 09:43:36 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Add inline keyword.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
attribute.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise. Change
static inline into auto inline.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
* sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Likewise.
2005-03-15 22:57:26 +00:00
|
|
|
auto inline void
|
|
|
|
__attribute__ ((always_inline))
|
2001-12-12 00:11:47 +00:00
|
|
|
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
2011-10-05 09:51:41 +00:00
|
|
|
void *const reloc_addr_arg, int skip_ifunc)
|
2001-12-12 00:11:47 +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 06:33:52 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-12-12 00:11:47 +00:00
|
|
|
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
|
|
|
|
{
|
2002-11-15 22:51:20 +00:00
|
|
|
# ifndef RESOLVE_CONFLICT_FIND_MAP
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
|
|
|
# endif
|
2005-06-10 11:33:52 +00:00
|
|
|
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
|
elf: Unify symbol address run-time calculation [BZ #19818]
Wrap symbol address run-time calculation into a macro and use it
throughout, replacing inline calculations.
There are a couple of variants, most of them different in a functionally
insignificant way. Most calculations are right following RESOLVE_MAP,
at which point either the map or the symbol returned can be checked for
validity as the macro sets either both or neither. In some places both
the symbol and the map has to be checked however.
My initial implementation therefore always checked both, however that
resulted in code larger by as much as 0.3%, as many places know from
elsewhere that no check is needed. I have decided the size growth was
unacceptable.
Having looked closer I realized that it's the map that is the culprit.
Therefore I have modified LOOKUP_VALUE_ADDRESS to accept an additional
boolean argument telling it to access the map without checking it for
validity. This in turn has brought quite nice results, with new code
actually being smaller for i686, and MIPS o32, n32 and little-endian n64
targets, unchanged in size for x86-64 and, unusually, marginally larger
for big-endian MIPS n64, as follows:
i686:
text data bss dec hex filename
152255 4052 192 156499 26353 ld-2.27.9000-base.so
152159 4052 192 156403 262f3 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/el:
text data bss dec hex filename
142906 4396 260 147562 2406a ld-2.27.9000-base.so
142890 4396 260 147546 2405a ld-2.27.9000-elf-symbol-value.so
MIPS/n32/el:
text data bss dec hex filename
142267 4404 260 146931 23df3 ld-2.27.9000-base.so
142171 4404 260 146835 23d93 ld-2.27.9000-elf-symbol-value.so
MIPS/n64/el:
text data bss dec hex filename
149835 7376 408 157619 267b3 ld-2.27.9000-base.so
149787 7376 408 157571 26783 ld-2.27.9000-elf-symbol-value.so
MIPS/o32/eb:
text data bss dec hex filename
142870 4396 260 147526 24046 ld-2.27.9000-base.so
142854 4396 260 147510 24036 ld-2.27.9000-elf-symbol-value.so
MIPS/n32/eb:
text data bss dec hex filename
142019 4404 260 146683 23cfb ld-2.27.9000-base.so
141923 4404 260 146587 23c9b ld-2.27.9000-elf-symbol-value.so
MIPS/n64/eb:
text data bss dec hex filename
149763 7376 408 157547 2676b ld-2.27.9000-base.so
149779 7376 408 157563 2677b ld-2.27.9000-elf-symbol-value.so
x86-64:
text data bss dec hex filename
148462 6452 400 155314 25eb2 ld-2.27.9000-base.so
148462 6452 400 155314 25eb2 ld-2.27.9000-elf-symbol-value.so
[BZ #19818]
* sysdeps/generic/ldsodefs.h (LOOKUP_VALUE_ADDRESS): Add `set'
parameter.
(SYMBOL_ADDRESS): New macro.
[!ELF_FUNCTION_PTR_IS_SPECIAL] (DL_SYMBOL_ADDRESS): Use
SYMBOL_ADDRESS for symbol address calculation.
* elf/dl-runtime.c (_dl_fixup): Likewise.
(_dl_profile_fixup): Likewise.
* elf/dl-symaddr.c (_dl_symbol_address): Likewise.
* elf/rtld.c (dl_main): Likewise.
* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/hppa/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Likewise.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
(elf_machine_rela): Likewise.
* sysdeps/ia64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/microblaze/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
(elf_machine_reloc): Likewise.
(elf_machine_got_rel): Likewise.
* sysdeps/mips/dl-trampoline.c (__dl_runtime_resolve): Likewise.
* sysdeps/nios2/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/riscv/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela):
Likewise.
* sysdeps/sh/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/tile/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2018-04-04 22:09:37 +00:00
|
|
|
Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true);
|
2001-12-12 00:11:47 +00:00
|
|
|
|
2011-04-26 21:00:46 +00:00
|
|
|
if (sym != NULL
|
2011-10-05 09:51:41 +00:00
|
|
|
&& __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0)
|
|
|
|
&& __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)
|
|
|
|
&& __builtin_expect (!skip_ifunc, 1))
|
2012-05-25 16:07:05 +00:00
|
|
|
value = elf_ifunc_invoke (value);
|
2011-04-26 21:00:46 +00:00
|
|
|
|
2001-12-12 00:11:47 +00:00
|
|
|
switch (r_type)
|
|
|
|
{
|
2002-11-15 22:51:20 +00:00
|
|
|
# ifndef RESOLVE_CONFLICT_FIND_MAP
|
|
|
|
/* Not needed for dl-conflict.c. */
|
|
|
|
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
|
2004-03-05 10:22:54 +00:00
|
|
|
|| (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
|
2002-11-15 22:51: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",
|
2013-05-29 16:00:20 +00:00
|
|
|
RTLD_PROGNAME, strtab + refsym->st_name);
|
2002-11-15 22:51: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 06:33:52 +00:00
|
|
|
memcpy (reloc_addr_arg, (void *) value,
|
|
|
|
MIN (sym->st_size, refsym->st_size));
|
2002-11-15 22:51:20 +00:00
|
|
|
break;
|
|
|
|
# endif /* !RESOLVE_CONFLICT_FIND_MAP */
|
2001-12-12 00:11:47 +00:00
|
|
|
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:
|
2012-10-05 16:39:23 +00:00
|
|
|
relocate_pc24 (map, value, reloc_addr, reloc->r_addend);
|
2001-12-12 00:11:47 +00:00
|
|
|
break;
|
2011-04-26 21:00:46 +00:00
|
|
|
#if !defined RTLD_BOOTSTRAP
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
case R_ARM_TLS_DTPMOD32:
|
|
|
|
/* Get the information from the link map returned by the
|
|
|
|
resolv function. */
|
|
|
|
if (sym_map != NULL)
|
|
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_TLS_DTPOFF32:
|
2006-09-21 18:21:19 +00:00
|
|
|
*reloc_addr = (sym == NULL ? 0 : sym->st_value) + reloc->r_addend;
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_TLS_TPOFF32:
|
2006-09-21 18:21:19 +00:00
|
|
|
if (sym != NULL)
|
|
|
|
{
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
*reloc_addr = (sym->st_value + sym_map->l_tls_offset
|
|
|
|
+ reloc->r_addend);
|
|
|
|
}
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
break;
|
2011-04-26 21:00:46 +00:00
|
|
|
case R_ARM_IRELATIVE:
|
2014-04-30 16:17:59 +00:00
|
|
|
value = map->l_addr + reloc->r_addend;
|
2019-11-29 16:55:22 +00:00
|
|
|
if (__glibc_likely (!skip_ifunc))
|
|
|
|
value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
|
2011-04-26 21:00:46 +00:00
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
* sysdeps/arm/dl-machine.h: Include <tls.h>.
(elf_machine_type_class, elf_machine_rel, elf_machine_rela): Handle
TLS relocations.
* sysdeps/unix/sysv/linux/arm/Makefile: Build __aeabi_read_tp.
* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_RAW): Renamed
from INTERNAL_SYSCALL.
(INTERNAL_SYSCALL, INTERNAL_SYSCALL_ARM): New macros.
* sysdeps/arm/dl-tls.h, sysdeps/arm/elf/configure.in,
sysdeps/arm/elf/configure, sysdeps/arm/libc-tls.c,
sysdeps/arm/linuxthreads/tls.h, sysdeps/arm/tls-macros.h,
sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S,
sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: New files.
2005-10-05 20:15:22 +00:00
|
|
|
#endif
|
2001-12-12 00:11:47 +00:00
|
|
|
default:
|
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
2001-12-12 00:11:47 +00:00
|
|
|
|
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Add inline keyword.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
attribute.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise. Change
static inline into auto inline.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
* sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Likewise.
2005-03-15 22:57:26 +00:00
|
|
|
auto inline void
|
|
|
|
__attribute__ ((always_inline))
|
2001-08-24 08:43:21 +00:00
|
|
|
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *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 06:33:52 +00:00
|
|
|
void *const reloc_addr_arg)
|
2001-08-24 08:43:21 +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 06:33:52 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-08-24 08:43:21 +00:00
|
|
|
*reloc_addr += l_addr;
|
|
|
|
}
|
|
|
|
|
2002-03-01 09:43:36 +00:00
|
|
|
# ifndef RTLD_BOOTSTRAP
|
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Add inline keyword.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
attribute.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise. Change
static inline into auto inline.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
* sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Likewise.
2005-03-15 22:57:26 +00:00
|
|
|
auto inline void
|
|
|
|
__attribute__ ((always_inline))
|
2001-12-12 00:11:47 +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 06:33:52 +00:00
|
|
|
void *const reloc_addr_arg)
|
2001-12-12 00:11:47 +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 06:33:52 +00:00
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
2001-12-12 00:11:47 +00:00
|
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
|
|
}
|
2002-03-01 09:43:36 +00:00
|
|
|
# endif
|
2001-12-12 00:11:47 +00:00
|
|
|
|
2005-03-15 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Add inline keyword.
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
attribute.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise. Change
static inline into auto inline.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
* sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
Likewise.
* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
Likewise.
2005-03-15 22:57:26 +00:00
|
|
|
auto inline void
|
|
|
|
__attribute__ ((always_inline))
|
1999-07-21 16:57:52 +00:00
|
|
|
elf_machine_lazy_rel (struct link_map *map,
|
2011-10-05 09:51:41 +00:00
|
|
|
Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
|
|
int skip_ifunc)
|
1998-03-18 14:28:36 +00:00
|
|
|
{
|
1998-08-28 22:54:12 +00:00
|
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
2001-08-24 08:43:21 +00:00
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
1998-09-18 09:10:23 +00:00
|
|
|
/* Check for unexpected PLT reloc type. */
|
2001-08-24 08:43:21 +00:00
|
|
|
if (__builtin_expect (r_type == R_ARM_JUMP_SLOT, 1))
|
2001-12-12 00:11:47 +00:00
|
|
|
{
|
|
|
|
if (__builtin_expect (map->l_mach.plt, 0) == 0)
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
else
|
|
|
|
*reloc_addr = map->l_mach.plt;
|
|
|
|
}
|
2011-03-05 03:39:15 +00:00
|
|
|
else if (__builtin_expect (r_type == R_ARM_TLS_DESC, 1))
|
|
|
|
{
|
2017-10-20 16:35:12 +00:00
|
|
|
const Elf_Symndx symndx = ELFW (R_SYM) (reloc->r_info);
|
|
|
|
const ElfW (Sym) *symtab = (const void *)D_PTR (map, l_info[DT_SYMTAB]);
|
|
|
|
const ElfW (Sym) *sym = &symtab[symndx];
|
|
|
|
const struct r_found_version *version = NULL;
|
|
|
|
|
|
|
|
if (map->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
|
|
|
|
{
|
|
|
|
const ElfW (Half) *vernum =
|
|
|
|
(const void *)D_PTR (map, l_info[VERSYMIDX (DT_VERSYM)]);
|
|
|
|
version = &map->l_versions[vernum[symndx] & 0x7fff];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Always initialize TLS descriptors completely, because lazy
|
|
|
|
initialization requires synchronization at every TLS access. */
|
|
|
|
elf_machine_rel (map, reloc, sym, version, reloc_addr, skip_ifunc);
|
2011-03-05 03:39:15 +00:00
|
|
|
}
|
1999-07-21 16:57:52 +00:00
|
|
|
else
|
2001-08-24 08:43:21 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
1998-03-18 14:28:36 +00:00
|
|
|
}
|
|
|
|
|
2005-06-10 11:33:52 +00:00
|
|
|
#endif /* RESOLVE_MAP */
|