2018-10-23 19:36:32 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. ARC version.
|
2021-01-02 19:32:25 +00:00
|
|
|
Copyright (C) 2020-2021 Free Software Foundation, Inc.
|
2018-10-23 19:36:32 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
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.
|
|
|
|
|
|
|
|
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
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library. If not, see
|
|
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "arc"
|
|
|
|
|
|
|
|
#include <entry.h>
|
|
|
|
|
|
|
|
#ifndef ENTRY_POINT
|
|
|
|
# error ENTRY_POINT needs to be defined for ARC
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <link.h>
|
|
|
|
#include <dl-tls.h>
|
elf: Fix dynamic-link.h usage on rtld.c
The 4af6982e4c fix does not fully handle RTLD_BOOTSTRAP usage on
rtld.c due two issues:
1. RTLD_BOOTSTRAP is also used on dl-machine.h on various
architectures and it changes the semantics of various machine
relocation functions.
2. The elf_get_dynamic_info() change was done sideways, previously
to 490e6c62aa get-dynamic-info.h was included by the first
dynamic-link.h include *without* RTLD_BOOTSTRAP being defined.
It means that the code within elf_get_dynamic_info() that uses
RTLD_BOOTSTRAP is in fact unused.
To fix 1. this patch now includes dynamic-link.h only once with
RTLD_BOOTSTRAP defined. The ELF_DYNAMIC_RELOCATE call will now have
the relocation fnctions with the expected semantics for the loader.
And to fix 2. part of 4af6982e4c is reverted (the check argument
elf_get_dynamic_info() is not required) and the RTLD_BOOTSTRAP
pieces are removed.
To reorganize the includes the static TLS definition is moved to
its own header to avoid a circular dependency (it is defined on
dynamic-link.h and dl-machine.h requires it at same time other
dynamic-link.h definition requires dl-machine.h defitions).
Also ELF_MACHINE_NO_REL, ELF_MACHINE_NO_RELA, and ELF_MACHINE_PLT_REL
are moved to its own header. Only ancient ABIs need special values
(arm, i386, and mips), so a generic one is used as default.
The powerpc Elf64_FuncDesc is also moved to its own header, since
csu code required its definition (which would require either include
elf/ folder or add a full path with elf/).
Checked on x86_64, i686, aarch64, armhf, powerpc64, powerpc32,
and powerpc64le.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
(cherry picked from commit d6d89608ac8cf2b37c75debad1fff653f6939f90)
Resolved conflicts:
elf/rtld.c
2021-10-13 12:49:34 +00:00
|
|
|
#include <dl-static-tls.h>
|
|
|
|
#include <dl-machine-rel.h>
|
2018-10-23 19:36:32 +00:00
|
|
|
|
|
|
|
/* Dynamic Linking ABI for ARCv2 ISA.
|
|
|
|
|
|
|
|
PLT
|
|
|
|
-------------------------------- <---- DT_PLTGOT
|
|
|
|
| ld r11, [pcl, off-to-GOT[1] | 0
|
|
|
|
| | 4
|
|
|
|
plt0 | ld r10, [pcl, off-to-GOT[2] | 8
|
|
|
|
| | 12
|
|
|
|
| j [r10] | 16
|
|
|
|
--------------------------------
|
|
|
|
| Base address of GOT | 20
|
|
|
|
--------------------------------
|
|
|
|
| ld r12, [pcl, off-to-GOT[3] | 24
|
|
|
|
plt1 | |
|
|
|
|
| j.d [r12] | 32
|
|
|
|
| mov r12, pcl | 36
|
|
|
|
--------------------------------
|
|
|
|
| | 40
|
|
|
|
~ ~
|
|
|
|
~ ~
|
|
|
|
| |
|
|
|
|
--------------------------------
|
|
|
|
|
|
|
|
.got
|
|
|
|
--------------
|
|
|
|
| [0] |
|
|
|
|
| ... | Runtime address for data symbols
|
|
|
|
| [n] |
|
|
|
|
--------------
|
|
|
|
|
|
|
|
.got.plt
|
|
|
|
--------------
|
|
|
|
| [0] | Build address of .dynamic
|
|
|
|
--------------
|
|
|
|
| [1] | Module info - setup by ld.so
|
|
|
|
--------------
|
|
|
|
| [2] | resolver entry point
|
|
|
|
--------------
|
|
|
|
| [3] |
|
|
|
|
| ... | Runtime address for function symbols
|
|
|
|
| [f] |
|
|
|
|
--------------
|
|
|
|
|
|
|
|
For ARCompact, the PLT is 12 bytes due to short instructions
|
|
|
|
|
|
|
|
--------------------------------
|
|
|
|
| ld r12, [pcl, off-to-GOT[3] | 24 (12 bytes each)
|
|
|
|
plt1 | |
|
|
|
|
| j_s.d [r12] | 32
|
|
|
|
| mov_s r12, pcl | 34
|
|
|
|
--------------------------------
|
|
|
|
| | 36 */
|
|
|
|
|
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
|
|
|
static inline int
|
2020-07-30 05:49:14 +00:00
|
|
|
elf_machine_matches_host (const ElfW(Ehdr) *ehdr)
|
2018-10-23 19:36:32 +00:00
|
|
|
{
|
|
|
|
return (ehdr->e_machine == EM_ARCV2 /* ARC HS. */
|
|
|
|
|| ehdr->e_machine == EM_ARC_COMPACT); /* ARC 700. */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get build time address of .dynamic as setup in GOT[0]
|
|
|
|
This is called very early in _dl_start so it has not been relocated to
|
|
|
|
runtime value. */
|
|
|
|
static inline ElfW(Addr)
|
|
|
|
elf_machine_dynamic (void)
|
|
|
|
{
|
|
|
|
extern const ElfW(Addr) _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
|
|
|
|
return _GLOBAL_OFFSET_TABLE_[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline ElfW(Addr)
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
|
|
|
ElfW(Addr) build_addr, run_addr;
|
|
|
|
|
|
|
|
/* For build address, below generates
|
|
|
|
ld r0, [pcl, _GLOBAL_OFFSET_TABLE_@pcl]. */
|
|
|
|
build_addr = elf_machine_dynamic ();
|
|
|
|
__asm__ ("add %0, pcl, _DYNAMIC@pcl \n" : "=r" (run_addr));
|
|
|
|
|
|
|
|
return run_addr - build_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up the loaded object described by L so its unrelocated PLT
|
|
|
|
entries will jump to the on-demand fixup code in dl-runtime.c. */
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
__attribute__ ((always_inline))
|
elf: Avoid nested functions in the loader [BZ #27220]
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 490e6c62aa31a8aa5c4a059f6e646ede121edf0a)
2021-10-07 18:55:02 +00:00
|
|
|
elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
|
|
|
|
int lazy, int profile)
|
2018-10-23 19:36:32 +00:00
|
|
|
{
|
2020-07-30 05:49:14 +00:00
|
|
|
extern void _dl_runtime_resolve (void);
|
2018-10-23 19:36:32 +00:00
|
|
|
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
{
|
|
|
|
/* On ARC DT_PLTGOT point to .plt whose 5th word (after the PLT header)
|
|
|
|
contains the address of .got. */
|
|
|
|
ElfW(Addr) *plt_base = (ElfW(Addr) *) D_PTR (l, l_info[DT_PLTGOT]);
|
|
|
|
ElfW(Addr) *got = (ElfW(Addr) *) (plt_base[5] + l->l_addr);
|
|
|
|
|
|
|
|
got[1] = (ElfW(Addr)) l; /* Identify this shared object. */
|
|
|
|
|
|
|
|
/* 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] = (ElfW(Addr)) &_dl_runtime_resolve;
|
|
|
|
}
|
|
|
|
|
|
|
|
return lazy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* What this code does:
|
|
|
|
-ldso starts execution here when kernel returns from execve
|
|
|
|
-calls into generic ldso entry point _dl_start
|
|
|
|
-optionally adjusts argc for executable if exec passed as cmd
|
|
|
|
-calls into app main with address of finaliser. */
|
|
|
|
|
|
|
|
#define RTLD_START asm ("\
|
|
|
|
.text \n\
|
|
|
|
.globl __start \n\
|
|
|
|
.type __start, @function \n\
|
|
|
|
__start: \n\
|
|
|
|
/* (1). bootstrap ld.so. */ \n\
|
|
|
|
bl.d _dl_start \n\
|
|
|
|
mov_s r0, sp /* pass ptr to aux vector tbl. */ \n\
|
|
|
|
mov r13, r0 /* safekeep app elf entry point. */ \n\
|
|
|
|
\n\
|
|
|
|
/* (2). If ldso ran with executable as arg. */ \n\
|
|
|
|
/* skip the extra args calc by dl_start. */ \n\
|
|
|
|
ld_s r1, [sp] /* orig argc. */ \n\
|
|
|
|
ld r12, [pcl, _dl_skip_args@pcl] \n\
|
|
|
|
breq r12, 0, 1f \n\
|
|
|
|
\n\
|
|
|
|
add2 sp, sp, r12 /* discard argv entries from stack. */ \n\
|
|
|
|
sub_s r1, r1, r12 /* adjusted argc on stack. */ \n\
|
|
|
|
st_s r1, [sp] \n\
|
|
|
|
add r2, sp, 4 \n\
|
|
|
|
/* intermediate LD for ST emcoding limitations. */ \n\
|
|
|
|
ld r3, [pcl, _dl_argv@gotpc] \n\
|
|
|
|
st r2, [r3] \n\
|
|
|
|
1: \n\
|
|
|
|
/* (3). call preinit stuff. */ \n\
|
|
|
|
ld r0, [pcl, _rtld_local@pcl] \n\
|
|
|
|
add r2, sp, 4 ; argv \n\
|
|
|
|
add2 r3, r2, r1 \n\
|
|
|
|
add r3, r3, 4 ; env \n\
|
|
|
|
bl _dl_init@plt \n\
|
|
|
|
\n\
|
|
|
|
/* (4) call app elf entry point. */ \n\
|
|
|
|
add r0, pcl, _dl_fini@pcl \n\
|
|
|
|
j [r13] \n\
|
|
|
|
\n\
|
|
|
|
.size __start,.-__start \n\
|
|
|
|
.previous \n\
|
|
|
|
");
|
|
|
|
|
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
|
|
|
PLT entries should not be allowed to define the value.
|
|
|
|
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
|
|
|
of the main executable's symbols, as for a COPY reloc. */
|
|
|
|
#define elf_machine_type_class(type) \
|
|
|
|
((((type) == R_ARC_JUMP_SLOT \
|
|
|
|
|| (type) == R_ARC_TLS_DTPMOD \
|
|
|
|
|| (type) == R_ARC_TLS_DTPOFF \
|
|
|
|
|| (type) == R_ARC_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT) \
|
|
|
|
| (((type) == R_ARC_COPY) * ELF_RTYPE_CLASS_COPY))
|
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
#define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT
|
|
|
|
|
|
|
|
/* Fixup a PLT entry to bounce directly to the function at VALUE. */
|
|
|
|
|
|
|
|
static inline ElfW(Addr)
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
|
|
|
const ElfW(Sym) *refsym, const ElfW(Sym) *sym,
|
2020-07-30 05:49:14 +00:00
|
|
|
const ElfW(Rela) *reloc,
|
2018-10-23 19:36:32 +00:00
|
|
|
ElfW(Addr) *reloc_addr, ElfW(Addr) value)
|
|
|
|
{
|
|
|
|
return *reloc_addr = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the final value of a plt relocation. */
|
2020-07-30 05:49:14 +00:00
|
|
|
#define elf_machine_plt_value(map, reloc, value) (value)
|
2018-10-23 19:36:32 +00:00
|
|
|
|
|
|
|
/* Names of the architecture-specific auditing callback functions. */
|
|
|
|
#define ARCH_LA_PLTENTER arc_gnu_pltenter
|
|
|
|
#define ARCH_LA_PLTEXIT arc_gnu_pltexit
|
|
|
|
|
|
|
|
#endif /* dl_machine_h */
|
|
|
|
|
|
|
|
#ifdef RESOLVE_MAP
|
|
|
|
|
elf: Avoid nested functions in the loader [BZ #27220]
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 490e6c62aa31a8aa5c4a059f6e646ede121edf0a)
2021-10-07 18:55:02 +00:00
|
|
|
static inline void
|
2018-10-23 19:36:32 +00:00
|
|
|
__attribute__ ((always_inline))
|
elf: Avoid nested functions in the loader [BZ #27220]
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 490e6c62aa31a8aa5c4a059f6e646ede121edf0a)
2021-10-07 18:55:02 +00:00
|
|
|
elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[],
|
|
|
|
const ElfW(Rela) *reloc, const ElfW(Sym) *sym,
|
|
|
|
const struct r_found_version *version,
|
2018-10-23 19:36:32 +00:00
|
|
|
void *const reloc_addr_arg, int skip_ifunc)
|
|
|
|
{
|
2020-07-30 05:49:14 +00:00
|
|
|
ElfW(Addr) r_info = reloc->r_info;
|
|
|
|
const unsigned long int r_type = ELFW (R_TYPE) (r_info);
|
2018-10-23 19:36:32 +00:00
|
|
|
ElfW(Addr) *const reloc_addr = reloc_addr_arg;
|
|
|
|
|
|
|
|
if (__glibc_unlikely (r_type == R_ARC_RELATIVE))
|
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
else if (__glibc_unlikely (r_type == R_ARC_NONE))
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const ElfW(Sym) *const refsym = sym;
|
elf: Avoid nested functions in the loader [BZ #27220]
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 490e6c62aa31a8aa5c4a059f6e646ede121edf0a)
2021-10-07 18:55:02 +00:00
|
|
|
struct link_map *sym_map = RESOLVE_MAP (map, scope, &sym, version,
|
|
|
|
r_type);
|
2018-10-23 19:36:32 +00:00
|
|
|
ElfW(Addr) value = SYMBOL_ADDRESS (sym_map, sym, true);
|
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_ARC_COPY:
|
|
|
|
if (__glibc_unlikely (sym == NULL))
|
|
|
|
/* This can happen in trace mode if an object could not be
|
|
|
|
found. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
size_t size = sym->st_size;
|
|
|
|
if (__glibc_unlikely (size != refsym->st_size))
|
|
|
|
{
|
|
|
|
const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
|
|
|
if (sym->st_size > refsym->st_size)
|
|
|
|
size = refsym->st_size;
|
|
|
|
if (sym->st_size > refsym->st_size || GLRO(dl_verbose))
|
|
|
|
_dl_error_printf ("\
|
|
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
|
|
|
rtld_progname ?: "<program name unknown>",
|
|
|
|
strtab + refsym->st_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (reloc_addr_arg, (void *) value, size);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_GLOB_DAT:
|
|
|
|
case R_ARC_JUMP_SLOT:
|
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_TLS_DTPMOD:
|
|
|
|
if (sym_map != NULL)
|
|
|
|
/* Get the information from the link map returned by the
|
|
|
|
resolv function. */
|
|
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_TLS_DTPOFF:
|
|
|
|
if (sym != NULL)
|
|
|
|
/* Offset set by the linker in the GOT entry would be overwritten
|
|
|
|
by dynamic loader instead of added to the symbol location.
|
|
|
|
Other target have the same approach on DTPOFF relocs. */
|
|
|
|
*reloc_addr += sym->st_value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_TLS_TPOFF:
|
|
|
|
if (sym != NULL)
|
|
|
|
{
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
*reloc_addr = sym_map->l_tls_offset + sym->st_value + reloc->r_addend;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_32:
|
|
|
|
*reloc_addr += value + reloc->r_addend;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARC_PC32:
|
|
|
|
*reloc_addr += value + reloc->r_addend - (unsigned long int) reloc_addr;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
elf: Fix dynamic-link.h usage on rtld.c
The 4af6982e4c fix does not fully handle RTLD_BOOTSTRAP usage on
rtld.c due two issues:
1. RTLD_BOOTSTRAP is also used on dl-machine.h on various
architectures and it changes the semantics of various machine
relocation functions.
2. The elf_get_dynamic_info() change was done sideways, previously
to 490e6c62aa get-dynamic-info.h was included by the first
dynamic-link.h include *without* RTLD_BOOTSTRAP being defined.
It means that the code within elf_get_dynamic_info() that uses
RTLD_BOOTSTRAP is in fact unused.
To fix 1. this patch now includes dynamic-link.h only once with
RTLD_BOOTSTRAP defined. The ELF_DYNAMIC_RELOCATE call will now have
the relocation fnctions with the expected semantics for the loader.
And to fix 2. part of 4af6982e4c is reverted (the check argument
elf_get_dynamic_info() is not required) and the RTLD_BOOTSTRAP
pieces are removed.
To reorganize the includes the static TLS definition is moved to
its own header to avoid a circular dependency (it is defined on
dynamic-link.h and dl-machine.h requires it at same time other
dynamic-link.h definition requires dl-machine.h defitions).
Also ELF_MACHINE_NO_REL, ELF_MACHINE_NO_RELA, and ELF_MACHINE_PLT_REL
are moved to its own header. Only ancient ABIs need special values
(arm, i386, and mips), so a generic one is used as default.
The powerpc Elf64_FuncDesc is also moved to its own header, since
csu code required its definition (which would require either include
elf/ folder or add a full path with elf/).
Checked on x86_64, i686, aarch64, armhf, powerpc64, powerpc32,
and powerpc64le.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
(cherry picked from commit d6d89608ac8cf2b37c75debad1fff653f6939f90)
Resolved conflicts:
elf/rtld.c
2021-10-13 12:49:34 +00:00
|
|
|
static inline void
|
2018-10-23 19:36:32 +00:00
|
|
|
__attribute__ ((always_inline))
|
|
|
|
elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
|
|
|
|
void *const reloc_addr_arg)
|
|
|
|
{
|
|
|
|
ElfW(Addr) *const reloc_addr = reloc_addr_arg;
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
}
|
|
|
|
|
elf: Fix dynamic-link.h usage on rtld.c
The 4af6982e4c fix does not fully handle RTLD_BOOTSTRAP usage on
rtld.c due two issues:
1. RTLD_BOOTSTRAP is also used on dl-machine.h on various
architectures and it changes the semantics of various machine
relocation functions.
2. The elf_get_dynamic_info() change was done sideways, previously
to 490e6c62aa get-dynamic-info.h was included by the first
dynamic-link.h include *without* RTLD_BOOTSTRAP being defined.
It means that the code within elf_get_dynamic_info() that uses
RTLD_BOOTSTRAP is in fact unused.
To fix 1. this patch now includes dynamic-link.h only once with
RTLD_BOOTSTRAP defined. The ELF_DYNAMIC_RELOCATE call will now have
the relocation fnctions with the expected semantics for the loader.
And to fix 2. part of 4af6982e4c is reverted (the check argument
elf_get_dynamic_info() is not required) and the RTLD_BOOTSTRAP
pieces are removed.
To reorganize the includes the static TLS definition is moved to
its own header to avoid a circular dependency (it is defined on
dynamic-link.h and dl-machine.h requires it at same time other
dynamic-link.h definition requires dl-machine.h defitions).
Also ELF_MACHINE_NO_REL, ELF_MACHINE_NO_RELA, and ELF_MACHINE_PLT_REL
are moved to its own header. Only ancient ABIs need special values
(arm, i386, and mips), so a generic one is used as default.
The powerpc Elf64_FuncDesc is also moved to its own header, since
csu code required its definition (which would require either include
elf/ folder or add a full path with elf/).
Checked on x86_64, i686, aarch64, armhf, powerpc64, powerpc32,
and powerpc64le.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
(cherry picked from commit d6d89608ac8cf2b37c75debad1fff653f6939f90)
Resolved conflicts:
elf/rtld.c
2021-10-13 12:49:34 +00:00
|
|
|
static inline void
|
2018-10-23 19:36:32 +00:00
|
|
|
__attribute__ ((always_inline))
|
elf: Avoid nested functions in the loader [BZ #27220]
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit 490e6c62aa31a8aa5c4a059f6e646ede121edf0a)
2021-10-07 18:55:02 +00:00
|
|
|
elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[],
|
|
|
|
ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
|
|
|
|
int skip_ifunc)
|
2018-10-23 19:36:32 +00:00
|
|
|
{
|
|
|
|
ElfW(Addr) *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
2020-07-30 05:49:14 +00:00
|
|
|
const unsigned int r_type = ELFW (R_TYPE) (reloc->r_info);
|
2018-10-23 19:36:32 +00:00
|
|
|
|
2020-07-30 05:49:14 +00:00
|
|
|
if (r_type == R_ARC_JUMP_SLOT)
|
2018-10-23 19:36:32 +00:00
|
|
|
*reloc_addr += l_addr;
|
|
|
|
else
|
2020-07-30 05:49:14 +00:00
|
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
2018-10-23 19:36:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE_MAP */
|