diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-10-13 09:49:34 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-10-14 14:52:07 -0300 |
| commit | d6d89608ac8cf2b37c75debad1fff653f6939f90 (patch) | |
| tree | 963c9d77032467e0b4af4f274979de09bd5c054e /sysdeps/s390 | |
| parent | e59ced238482fd71f3e493717f14f6507346741e (diff) | |
| download | glibc-d6d89608ac8cf2b37c75debad1fff653f6939f90.tar.gz glibc-d6d89608ac8cf2b37c75debad1fff653f6939f90.tar.xz glibc-d6d89608ac8cf2b37c75debad1fff653f6939f90.zip | |
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>
Diffstat (limited to 'sysdeps/s390')
| -rw-r--r-- | sysdeps/s390/s390-32/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/dl-machine.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h index cd16cc7e00..c1d9bb41db 100644 --- a/sysdeps/s390/s390-32/dl-machine.h +++ b/sysdeps/s390/s390-32/dl-machine.h @@ -26,6 +26,8 @@ #include <link.h> #include <sysdeps/s390/dl-procinfo.h> #include <dl-irel.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* This is an older, now obsolete value. */ #define EM_S390_OLD 0xA390 @@ -276,10 +278,6 @@ _dl_start_user:\n\ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_390_JMP_SLOT -/* The S390 never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* We define an initialization functions. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () diff --git a/sysdeps/s390/s390-64/dl-machine.h b/sysdeps/s390/s390-64/dl-machine.h index 0330a8d7de..d405f01a03 100644 --- a/sysdeps/s390/s390-64/dl-machine.h +++ b/sysdeps/s390/s390-64/dl-machine.h @@ -27,6 +27,8 @@ #include <link.h> #include <sysdeps/s390/dl-procinfo.h> #include <dl-irel.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> #define ELF_MACHINE_IRELATIVE R_390_IRELATIVE @@ -224,10 +226,6 @@ _dl_start_user:\n\ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_390_JMP_SLOT -/* The 64 bit S/390 never uses Elf64_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* We define an initialization functions. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () |