diff options
Diffstat (limited to 'sysdeps')
29 files changed, 199 insertions, 110 deletions
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index e30e81c902..0d5ad218c1 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -24,7 +24,9 @@ #include <sysdep.h> #include <tls.h> #include <dl-tlsdesc.h> +#include <dl-static-tls.h> #include <dl-irel.h> +#include <dl-machine-rel.h> #include <cpu-features.c> /* Translate a processor specific dynamic tag to the index in l_info array. */ @@ -190,10 +192,6 @@ _dl_start_user: \n\ #define ELF_MACHINE_JMP_SLOT AARCH64_R(JUMP_SLOT) -/* AArch64 uses RELA not REL */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - #define DL_PLATFORM_INIT dl_platform_init () static inline void __attribute__ ((unused)) @@ -370,7 +368,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], } } -inline void +static inline void __attribute__ ((always_inline)) elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 491541326f..7d6282e599 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -25,6 +25,8 @@ #define ELF_MACHINE_NAME "alpha" #include <string.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Mask identifying addresses reserved for the user program, @@ -240,10 +242,6 @@ $fixup_stack: \n\ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_ALPHA_JMP_SLOT -/* The alpha 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 () diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h index 4b64ffec25..f843ed9bd6 100644 --- a/sysdeps/arc/dl-machine.h +++ b/sysdeps/arc/dl-machine.h @@ -30,6 +30,8 @@ #include <string.h> #include <link.h> #include <dl-tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Dynamic Linking ABI for ARCv2 ISA. @@ -203,10 +205,6 @@ __start: \n\ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT -/* ARC uses Rela relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Fixup a PLT entry to bounce directly to the function at VALUE. */ static inline ElfW(Addr) @@ -318,7 +316,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], } } -inline void +static inline void __attribute__ ((always_inline)) elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, void *const reloc_addr_arg) @@ -327,7 +325,7 @@ elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, *reloc_addr += l_addr; } -inline void +static inline void __attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[], ElfW(Addr) l_addr, const ElfW(Rela) *reloc, diff --git a/sysdeps/arm/dl-machine-rel.h b/sysdeps/arm/dl-machine-rel.h new file mode 100644 index 0000000000..bec114706c --- /dev/null +++ b/sysdeps/arm/dl-machine-rel.h @@ -0,0 +1,31 @@ +/* ELF dynamic relocation type supported by the architecture. ARM version. + Copyright (C) 2001-2021 Free Software Foundation, Inc. + 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_REL_H +#define _DL_MACHINE_REL_H + +/* ARM never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP +#define ELF_MACHINE_NO_REL 0 + +/* ARM never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +#define ELF_MACHINE_PLT_REL 1 + +#endif diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index dfa05eee44..c758bba169 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -26,6 +26,8 @@ #include <tls.h> #include <dl-tlsdesc.h> #include <dl-irel.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> #ifndef CLEAR_CACHE # error CLEAR_CACHE definition required to handle TEXTREL @@ -231,10 +233,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_ARM_JUMP_SLOT -/* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_PLT_REL 1 - /* We define an initialization functions. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () @@ -267,11 +265,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, #endif /* !dl_machine_h */ -/* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP -#define ELF_MACHINE_NO_REL 0 - /* Names of the architecture-specific auditing callback functions. */ #define ARCH_LA_PLTENTER arm_gnu_pltenter #define ARCH_LA_PLTEXIT arm_gnu_pltexit diff --git a/sysdeps/csky/dl-machine.h b/sysdeps/csky/dl-machine.h index ec22f87577..4dfd957877 100644 --- a/sysdeps/csky/dl-machine.h +++ b/sysdeps/csky/dl-machine.h @@ -24,6 +24,8 @@ #include <sys/param.h> #include <sysdep.h> #include <dl-tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero if ELF header is compatible with the running host. */ static inline int @@ -172,10 +174,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_CKCORE_JUMP_SLOT -/* C-SKY 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/generic/dl-machine-rel.h b/sysdeps/generic/dl-machine-rel.h new file mode 100644 index 0000000000..9167a1dffc --- /dev/null +++ b/sysdeps/generic/dl-machine-rel.h @@ -0,0 +1,27 @@ +/* ELF dynamic relocation type supported by the architecture. + Copyright (C) 2001-2021 Free Software Foundation, Inc. + 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_REL_H +#define _DL_MACHINE_REL_H + +/* Defined if the architecture supports Elf{32,64}_Rel relocations. */ +#define ELF_MACHINE_NO_REL 1 +/* Defined if the architecture supports Elf{32,64}_Rela relocations. */ +#define ELF_MACHINE_NO_RELA 0 + +#endif diff --git a/sysdeps/generic/dl-machine.h b/sysdeps/generic/dl-machine.h index 4a4ab4fc70..7da695d903 100644 --- a/sysdeps/generic/dl-machine.h +++ b/sysdeps/generic/dl-machine.h @@ -20,6 +20,8 @@ #include <string.h> #include <link.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h index e6a4575fce..7c5d0e9430 100644 --- a/sysdeps/hppa/dl-machine.h +++ b/sysdeps/hppa/dl-machine.h @@ -29,6 +29,8 @@ #include <dl-fptr.h> #include <abort-instr.h> #include <tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* These two definitions must match the definition of the stub in bfd/elf32-hppa.c (see plt_stub[]). @@ -509,10 +511,6 @@ asm ( \ #define ELF_MACHINE_JMP_SLOT R_PARISC_IPLT #define ELF_MACHINE_SIZEOF_JMP_SLOT PLT_ENTRY_SIZE -/* We only use RELA. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Return the address of the entry point. */ #define ELF_MACHINE_START_ADDRESS(map, start) \ ({ \ diff --git a/sysdeps/i386/dl-machine-rel.h b/sysdeps/i386/dl-machine-rel.h new file mode 100644 index 0000000000..7ac46f78a6 --- /dev/null +++ b/sysdeps/i386/dl-machine-rel.h @@ -0,0 +1,31 @@ +/* ELF dynamic relocation type supported by the architecture. ARM version. + Copyright (C) 2001-2021 Free Software Foundation, Inc. + 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_REL_H +#define _DL_MACHINE_REL_H + +/* The i386 never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP +#define ELF_MACHINE_NO_REL 0 + +/* The i386 never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +#define ELF_MACHINE_PLT_REL 1 + +#endif diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 78bed03eee..169bed50ff 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -26,6 +26,8 @@ #include <sysdep.h> #include <tls.h> #include <dl-tlsdesc.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) @@ -230,10 +232,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_386_JMP_SLOT -/* The i386 never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_PLT_REL 1 - /* We define an initialization functions. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () @@ -276,11 +274,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, #endif /* !dl_machine_h */ -/* The i386 never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP -#define ELF_MACHINE_NO_REL 0 - #ifdef RESOLVE_MAP /* Perform the relocation specified by RELOC and SYM (which is fully resolved). diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 2217d0b556..c9608a51b0 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -27,6 +27,8 @@ #include <errno.h> #include <dl-fptr.h> #include <tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Translate a processor specific dynamic tag to the index in l_info array. */ @@ -319,10 +321,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_IA64_IPLTLSB -/* According to the IA-64 specific documentation, Rela is always used. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Return the address of the entry point. */ #define ELF_MACHINE_START_ADDRESS(map, start) \ ({ \ diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 5e34c4784e..30323d62d4 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -24,6 +24,8 @@ #include <sys/param.h> #include <sysdep.h> #include <dl-tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int @@ -183,10 +185,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_68K_JMP_SLOT -/* The m68k never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - static inline Elf32_Addr elf_machine_fixup_plt (struct link_map *map, lookup_t t, const ElfW(Sym) *refsym, const ElfW(Sym) *sym, diff --git a/sysdeps/microblaze/dl-machine.h b/sysdeps/microblaze/dl-machine.h index 3fd4988e60..b8cc5a7fe6 100644 --- a/sysdeps/microblaze/dl-machine.h +++ b/sysdeps/microblaze/dl-machine.h @@ -23,6 +23,8 @@ #include <sys/param.h> #include <tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int @@ -169,10 +171,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_MICROBLAZE_JUMP_SLOT -/* The microblaze never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - static inline Elf32_Addr elf_machine_fixup_plt (struct link_map *map, lookup_t t, const ElfW(Sym) *refsym, const ElfW(Sym) *sym, diff --git a/sysdeps/mips/dl-machine-rel.h b/sysdeps/mips/dl-machine-rel.h new file mode 100644 index 0000000000..ed39618041 --- /dev/null +++ b/sysdeps/mips/dl-machine-rel.h @@ -0,0 +1,26 @@ +/* ELF dynamic relocation type supported by the architecture. ARM version. + Copyright (C) 2001-2021 Free Software Foundation, Inc. + 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_REL_H +#define _DL_MACHINE_REL_H + +#define ELF_MACHINE_PLT_REL 1 +#define ELF_MACHINE_NO_REL 0 +#define ELF_MACHINE_NO_RELA 0 + +#endif diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index f8d1298b60..d7b8341b74 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -32,6 +32,8 @@ #include <sysdep.h> #include <sys/asm.h> #include <dl-tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* The offset of gp from GOT might be system-dependent. It's set by ld. The same value is also */ @@ -59,10 +61,6 @@ ((((type) == ELF_MACHINE_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) -#define ELF_MACHINE_PLT_REL 1 -#define ELF_MACHINE_NO_REL 0 -#define ELF_MACHINE_NO_RELA 0 - /* Translate a processor specific dynamic tag to the index in l_info array. */ #define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM) diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h index 4de602b13d..430ca5d7ae 100644 --- a/sysdeps/nios2/dl-machine.h +++ b/sysdeps/nios2/dl-machine.h @@ -24,6 +24,8 @@ #include <string.h> #include <link.h> #include <dl-tls.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int @@ -200,10 +202,6 @@ _start:\n\ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_NIOS2_JUMP_SLOT -/* The Nios II never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Fixup a PLT entry to bounce directly to the function at VALUE. */ static inline Elf32_Addr diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h index cda012dc1b..8d062951ce 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.h +++ b/sysdeps/powerpc/powerpc32/dl-machine.h @@ -25,6 +25,8 @@ #include <dl-tls.h> #include <dl-irel.h> #include <hwcapinfo.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Translate a processor specific dynamic tag to the index in l_info array. */ @@ -145,10 +147,6 @@ __elf_preferred_address(struct link_map *loader, size_t maplength, /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_PPC_JMP_SLOT -/* The PowerPC never uses REL relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* We define an initialization function to initialize HWCAP/HWCAP2 and platform data so it can be copied into the TCB later. This is called very early in _dl_sysdep_start for dynamically linked binaries. */ diff --git a/sysdeps/powerpc/powerpc64/dl-funcdesc.h b/sysdeps/powerpc/powerpc64/dl-funcdesc.h new file mode 100644 index 0000000000..b2d1f76ce0 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/dl-funcdesc.h @@ -0,0 +1,34 @@ +/* PowerPC ELFv1 function descriptor definition. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + 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_FUNCDESC_H +#define _DL_FUNCDESC_H + +#if _CALL_ELF != 2 +/* A PowerPC64 function descriptor. The .plt (procedure linkage + table) and .opd (official procedure descriptor) sections are + arrays of these. */ +typedef struct +{ + Elf64_Addr fd_func; + Elf64_Addr fd_toc; + Elf64_Addr fd_aux; +} Elf64_FuncDesc; +#endif + +#endif diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64/dl-irel.h index 0e11b7ff64..aa9a2dca71 100644 --- a/sysdeps/powerpc/powerpc64/dl-irel.h +++ b/sysdeps/powerpc/powerpc64/dl-irel.h @@ -23,7 +23,7 @@ #include <stdio.h> #include <unistd.h> #include <ldsodefs.h> -#include <dl-machine.h> +#include <dl-funcdesc.h> #define ELF_MACHINE_IRELA 1 diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 3f92fbb369..3a4a21a412 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -28,23 +28,14 @@ #include <sysdep.h> #include <hwcapinfo.h> #include <cpu-features.c> +#include <dl-static-tls.h> +#include <dl-funcdesc.h> +#include <dl-machine-rel.h> /* Translate a processor specific dynamic tag to the index in l_info array. */ #define DT_PPC64(x) (DT_PPC64_##x - DT_LOPROC + DT_NUM) -#if _CALL_ELF != 2 -/* A PowerPC64 function descriptor. The .plt (procedure linkage - table) and .opd (official procedure descriptor) sections are - arrays of these. */ -typedef struct -{ - Elf64_Addr fd_func; - Elf64_Addr fd_toc; - Elf64_Addr fd_aux; -} Elf64_FuncDesc; -#endif - #define ELF_MULT_MACHINES_SUPPORTED /* Return nonzero iff ELF header is compatible with the running host. */ @@ -292,10 +283,6 @@ BODY_PREFIX "_dl_start_user:\n" \ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_PPC64_JMP_SLOT -/* The PowerPC never uses REL relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* We define an initialization function to initialize HWCAP/HWCAP2 and platform data so it can be copied into the TCB later. This is called very early in _dl_sysdep_start for dynamically linked binaries. */ diff --git a/sysdeps/riscv/dl-machine.h b/sysdeps/riscv/dl-machine.h index e7289d7ddc..ce2b3c3875 100644 --- a/sysdeps/riscv/dl-machine.h +++ b/sysdeps/riscv/dl-machine.h @@ -26,6 +26,8 @@ #include <sys/asm.h> #include <dl-tls.h> #include <dl-irel.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> #ifndef _RTLD_PROLOGUE # define _RTLD_PROLOGUE(entry) \ @@ -51,9 +53,6 @@ || (__WORDSIZE == 64 && (type) == R_RISCV_TLS_TPREL64))) \ | (ELF_RTYPE_CLASS_COPY * ((type) == R_RISCV_COPY))) -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute_used__ elf_machine_matches_host (const ElfW(Ehdr) *ehdr) 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 () diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index 0c22dfd848..d14023e749 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -24,6 +24,8 @@ #include <sys/param.h> #include <sysdep.h> #include <assert.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) @@ -251,10 +253,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc, #endif /* !dl_machine_h */ -/* SH never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - #ifdef RESOLVE_MAP /* Perform the relocation specified by RELOC and SYM (which is fully resolved). diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 6361cfae9e..78f53bc499 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -28,6 +28,8 @@ #include <tls.h> #include <dl-plt.h> #include <elf/dl-hwcaps.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int @@ -196,10 +198,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_SPARC_JMP_SLOT -/* The SPARC never uses Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* Undo the sub %sp, 6*4, %sp; add %sp, 22*4, %o0 below to get at the value we want in __libc_stack_end. */ #define DL_STACK_END(cookie) \ diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 3fd18c6e5e..3fa79d038f 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -26,6 +26,8 @@ #include <ldsodefs.h> #include <sysdep.h> #include <dl-plt.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> #define ELF64_R_TYPE_ID(info) ((info) & 0xff) #define ELF64_R_TYPE_DATA(info) ((info) >> 8) @@ -118,10 +120,6 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc, /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ #define ELF_MACHINE_JMP_SLOT R_SPARC_JMP_SLOT -/* The SPARC never uses Elf64_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* 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. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h index db388a022d..72b75d3beb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/powerpc/libc-vdso.h @@ -24,7 +24,7 @@ #include <sysdep-vdso.h> #if (defined(__PPC64__) || defined(__powerpc64__)) && _CALL_ELF != 2 -# include <dl-machine.h> +# include <dl-funcdesc.h> /* The correct solution is for _dl_vdso_vsym to return the address of the OPD for the kernel VDSO function. That address would then be stored in the __vdso_* variables and returned as the result of the IFUNC resolver function. diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 20afb0b4bc..b1a5297b66 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -26,6 +26,8 @@ #include <sysdep.h> #include <tls.h> #include <dl-tlsdesc.h> +#include <dl-static-tls.h> +#include <dl-machine-rel.h> /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) @@ -200,10 +202,6 @@ _dl_start_user:\n\ // XXX This is a work-around for a broken linker. Remove! #define ELF_MACHINE_IRELATIVE R_X86_64_IRELATIVE -/* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations. */ -#define ELF_MACHINE_NO_REL 1 -#define ELF_MACHINE_NO_RELA 0 - /* We define an initialization function. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () |