mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
d6d89608ac
The4af6982e4cfix 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 to490e6c62aaget-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 of4af6982e4cis 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>
64 lines
1.9 KiB
C
64 lines
1.9 KiB
C
/* Machine-dependent ELF indirect relocation inline functions.
|
|
PowerPC64 version.
|
|
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_IREL_H
|
|
#define _DL_IREL_H
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
#include <dl-funcdesc.h>
|
|
|
|
#define ELF_MACHINE_IRELA 1
|
|
|
|
static inline Elf64_Addr
|
|
__attribute ((always_inline))
|
|
elf_ifunc_invoke (Elf64_Addr addr)
|
|
{
|
|
return ((Elf64_Addr (*) (unsigned long int)) (addr)) (GLRO(dl_hwcap));
|
|
}
|
|
|
|
static inline void
|
|
__attribute ((always_inline))
|
|
elf_irela (const Elf64_Rela *reloc)
|
|
{
|
|
unsigned int r_type = ELF64_R_TYPE (reloc->r_info);
|
|
|
|
if (__glibc_likely (r_type == R_PPC64_IRELATIVE))
|
|
{
|
|
Elf64_Addr *const reloc_addr = (void *) reloc->r_offset;
|
|
Elf64_Addr value = elf_ifunc_invoke(reloc->r_addend);
|
|
*reloc_addr = value;
|
|
}
|
|
else if (__glibc_likely (r_type == R_PPC64_JMP_IREL))
|
|
{
|
|
Elf64_Addr *const reloc_addr = (void *) reloc->r_offset;
|
|
Elf64_Addr value = elf_ifunc_invoke(reloc->r_addend);
|
|
#if _CALL_ELF != 2
|
|
*(Elf64_FuncDesc *) reloc_addr = *(Elf64_FuncDesc *) value;
|
|
#else
|
|
*reloc_addr = value;
|
|
#endif
|
|
}
|
|
else
|
|
__libc_fatal ("Unexpected reloc type in static binary.\n");
|
|
}
|
|
|
|
#endif /* dl-irel.h */
|