2015-01-18 06:29:12 +00:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. Nios II version.
|
2024-01-01 18:12:26 +00:00
|
|
|
Copyright (C) 1995-2024 Free Software Foundation, Inc.
|
2015-01-18 06:29:12 +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
|
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/>. */
|
2015-01-18 06:29:12 +00:00
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "nios2"
|
|
|
|
|
|
|
|
#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>
2021-10-13 12:49:34 +00:00
|
|
|
#include <dl-static-tls.h>
|
|
|
|
#include <dl-machine-rel.h>
|
2015-01-18 06:29:12 +00:00
|
|
|
|
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
|
|
|
static inline int
|
|
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
|
|
|
{
|
|
|
|
return ehdr->e_machine == EM_ALTERA_NIOS2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
|
|
|
first element of the GOT. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_dynamic (void)
|
|
|
|
{
|
|
|
|
Elf32_Addr *dynamic;
|
|
|
|
int tmp;
|
|
|
|
asm ("nextpc\t%0\n\t"
|
|
|
|
"1: movhi\t%1, %%hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)\n\t"
|
|
|
|
"addi\t%1, %1, %%lo(_GLOBAL_OFFSET_TABLE_ - 1b)\n\t"
|
|
|
|
"add\t%0, %0, %1\n"
|
|
|
|
: "=r" (dynamic), "=r" (tmp));
|
|
|
|
return *dynamic;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
|
|
|
Elf32_Addr result;
|
|
|
|
int tmp;
|
|
|
|
asm ("nextpc\t%0\n\t"
|
|
|
|
"1: movhi\t%1, %%hiadj(1b)\n\t"
|
|
|
|
"addi\t%1, %1, %%lo(1b)\n\t"
|
|
|
|
"sub\t%0, %0, %1\n"
|
|
|
|
: "=r" (result), "=r" (tmp));
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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>
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)
|
2015-01-18 06:29:12 +00:00
|
|
|
{
|
|
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
|
|
|
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
{
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
|
|
in. Their initial contents will arrange when called to load r15 with
|
|
|
|
an offset into the .got section, load r14 with
|
|
|
|
_GLOBAL_OFFSET_TABLE_[1], and then jump to _GLOBAL_OFFSET_TABLE[2].
|
|
|
|
*/
|
|
|
|
Elf32_Addr *got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
|
|
|
|
got[1] = (Elf32_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] = (Elf32_Addr) &_dl_runtime_resolve;
|
|
|
|
}
|
|
|
|
|
|
|
|
return lazy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initial entry point code for the dynamic linker.
|
|
|
|
The C function `_dl_start' is the real entry point;
|
|
|
|
its return value is the user program's entry point. */
|
|
|
|
|
|
|
|
#define RTLD_START asm ("\
|
|
|
|
.text\n\
|
|
|
|
.globl _start\n\
|
|
|
|
.type _start, %function\n\
|
|
|
|
_start:\n\
|
|
|
|
/* At start time, all the args are on the stack. */\n\
|
|
|
|
mov r4, sp\n\
|
|
|
|
\n\
|
|
|
|
/* Start the calculation of the GOT pointer. */\n\
|
|
|
|
nextpc r22\n\
|
|
|
|
1: movhi r8, %hiadj(_gp_got - 1b)\n\
|
|
|
|
addi r8, r8, %lo(_gp_got - 1b)\n\
|
|
|
|
\n\
|
|
|
|
/* Figure out where _dl_start will need to return to. */\n\
|
|
|
|
movhi ra, %hiadj(2f - 1b)\n\
|
|
|
|
addi ra, ra, %lo(2f - 1b)\n\
|
|
|
|
add ra, ra, r22\n\
|
|
|
|
\n\
|
|
|
|
/* Finish the calculation of the GOT pointer. */\n\
|
|
|
|
add r22, r22, r8\n\
|
|
|
|
\n\
|
|
|
|
br _dl_start\n\
|
|
|
|
\n\
|
|
|
|
/* Save the returned user entry point. */\n\
|
|
|
|
2: mov r16, r2\n\
|
|
|
|
\n\
|
|
|
|
/* Initialize gp. */\n\
|
|
|
|
ldw r4, %got(_rtld_local)(r22)\n\
|
|
|
|
ldw r4, 0(r4)\n\
|
|
|
|
ldw r8, %call(_dl_nios2_get_gp_value)(r22)\n\
|
|
|
|
callr r8\n\
|
|
|
|
mov gp, r2\n\
|
|
|
|
\n\
|
|
|
|
/* Find the main_map from the GOT. */\n\
|
|
|
|
ldw r4, %got(_rtld_local)(r22)\n\
|
|
|
|
ldw r4, 0(r4)\n\
|
|
|
|
\n\
|
2022-05-26 16:12:21 +00:00
|
|
|
/* Load adjusted argc. */\n\
|
|
|
|
ldw r2, %got(_dl_argc)(r22)\n\
|
|
|
|
ldw r5, 0(r2)\n\
|
2015-01-18 06:29:12 +00:00
|
|
|
\n\
|
2023-05-30 23:02:29 +00:00
|
|
|
/* Load adjusted argv. */\n\
|
2015-01-18 06:29:12 +00:00
|
|
|
ldw r2, %got(_dl_argv)(r22)\n\
|
2022-05-26 16:12:21 +00:00
|
|
|
ldw r6, 0(r2)\n\
|
|
|
|
\n\
|
|
|
|
/* envp = argv + argc + 1 */\n\
|
|
|
|
addi r7, r5, 1\n\
|
|
|
|
slli r7, r7, 2\n\
|
|
|
|
add r7, r7, r6\n\
|
2015-01-18 06:29:12 +00:00
|
|
|
\n\
|
|
|
|
/* Call _dl_init through the PLT. */\n\
|
|
|
|
ldw r8, %call(_dl_init)(r22)\n\
|
|
|
|
callr r8\n\
|
|
|
|
\n\
|
|
|
|
/* Find the finalization function. */\n\
|
|
|
|
ldw r4, %got(_dl_fini)(r22)\n\
|
|
|
|
\n\
|
|
|
|
/* Jump to the user's entry point. */\n\
|
|
|
|
jmp r16\n\
|
|
|
|
");
|
|
|
|
|
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
|
|
|
PLT entries 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-01-18 06:29:12 +00:00
|
|
|
of the main executable's symbols, as for a COPY reloc. */
|
|
|
|
#define elf_machine_type_class(type) \
|
|
|
|
((((type) == R_NIOS2_JUMP_SLOT \
|
|
|
|
|| (type) == R_NIOS2_TLS_DTPMOD \
|
|
|
|
|| (type) == R_NIOS2_TLS_DTPREL \
|
|
|
|
|| (type) == R_NIOS2_TLS_TPREL) * ELF_RTYPE_CLASS_PLT) \
|
2022-06-15 20:02:17 +00:00
|
|
|
| (((type) == R_NIOS2_COPY) * ELF_RTYPE_CLASS_COPY))
|
2015-01-18 06:29:12 +00:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
|
|
#define ELF_MACHINE_JMP_SLOT R_NIOS2_JUMP_SLOT
|
|
|
|
|
|
|
|
/* Fixup a PLT entry to bounce directly to the function at VALUE. */
|
|
|
|
|
|
|
|
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,
|
2015-01-18 06:29:12 +00:00
|
|
|
const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
|
|
|
return *reloc_addr = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the final value of a plt relocation. */
|
|
|
|
static inline Elf32_Addr
|
|
|
|
elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
|
|
|
|
Elf32_Addr value)
|
|
|
|
{
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Names of the architecture-specific auditing callback functions. */
|
|
|
|
#define ARCH_LA_PLTENTER nios2_gnu_pltenter
|
|
|
|
#define ARCH_LA_PLTEXIT nios2_gnu_pltexit
|
|
|
|
|
|
|
|
#endif /* dl_machine_h */
|
|
|
|
|
|
|
|
#ifdef RESOLVE_MAP
|
|
|
|
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
|
|
LOADADDR is the load address of the object; INFO is an array indexed
|
|
|
|
by DT_* of the .dynamic section info. */
|
|
|
|
|
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>
2021-10-07 18:55:02 +00:00
|
|
|
static inline void __attribute__ ((always_inline))
|
|
|
|
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,
|
|
|
|
void *const reloc_addr_arg, int skip_ifunc)
|
2015-01-18 06:29:12 +00:00
|
|
|
{
|
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
|
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
|
|
|
|
if (__glibc_unlikely (r_type == R_NIOS2_RELATIVE))
|
|
|
|
*reloc_addr = map->l_addr + reloc->r_addend;
|
|
|
|
else if (__glibc_unlikely (r_type == R_NIOS2_NONE))
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const Elf32_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>
2021-10-07 18:55:02 +00:00
|
|
|
struct link_map *sym_map = RESOLVE_MAP (map, scope, &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);
|
2015-01-18 06:29:12 +00:00
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_NIOS2_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
|
|
|
|
|| (sym->st_size < refsym->st_size && GLRO(dl_verbose)))
|
|
|
|
{
|
|
|
|
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",
|
|
|
|
rtld_progname ?: "<program name unknown>",
|
|
|
|
strtab + refsym->st_name);
|
|
|
|
}
|
|
|
|
memcpy (reloc_addr_arg, (void *) value,
|
|
|
|
MIN (sym->st_size, refsym->st_size));
|
|
|
|
break;
|
|
|
|
case R_NIOS2_GLOB_DAT:
|
|
|
|
case R_NIOS2_JUMP_SLOT:
|
|
|
|
# ifdef RTLD_BOOTSTRAP
|
|
|
|
/* Fix weak undefined references. */
|
|
|
|
if (sym != NULL && sym->st_value == 0)
|
|
|
|
*reloc_addr = 0;
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
*reloc_addr = value;
|
|
|
|
break;
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
case R_NIOS2_TLS_DTPMOD:
|
|
|
|
/* 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_NIOS2_TLS_DTPREL:
|
|
|
|
*reloc_addr = reloc->r_addend + TLS_DTPREL_VALUE(sym);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_NIOS2_TLS_TPREL:
|
|
|
|
if (sym != NULL)
|
|
|
|
{
|
|
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
|
|
*reloc_addr = reloc->r_addend + TLS_TPREL_VALUE(sym_map, sym);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
case R_NIOS2_BFD_RELOC_32:
|
|
|
|
*reloc_addr = value + reloc->r_addend;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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>
2021-10-07 18:55:02 +00:00
|
|
|
static inline void __attribute__((always_inline))
|
2015-01-18 06:29:12 +00:00
|
|
|
elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
|
|
|
|
void *const reloc_addr_arg)
|
|
|
|
{
|
|
|
|
Elf32_Addr *const reloc_addr = reloc_addr_arg;
|
|
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
|
|
}
|
|
|
|
|
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>
2021-10-07 18:55:02 +00:00
|
|
|
static inline void __attribute__((always_inline))
|
|
|
|
elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[],
|
2015-01-18 06:29:12 +00:00
|
|
|
ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
|
|
|
|
int skip_ifunc)
|
|
|
|
{
|
|
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_NIOS2_JUMP_SLOT)
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
else
|
|
|
|
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE_MAP */
|