diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-04-14 08:24:51 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-04-14 11:27:23 +0200 |
| commit | c15fbfdc0ebff8c05713c2f1e7387ce38acc3a37 (patch) | |
| tree | cb61175d9adea360e4a5df34f5d333df7edfc828 | |
| parent | a4c897e4c7a4424e3fbf8853b721844bcb35b9dd (diff) | |
| download | glibc-c15fbfdc0ebff8c05713c2f1e7387ce38acc3a37.tar.gz glibc-c15fbfdc0ebff8c05713c2f1e7387ce38acc3a37.tar.xz glibc-c15fbfdc0ebff8c05713c2f1e7387ce38acc3a37.zip | |
powerpc: Fix ld.so address determination for PCREL mode (bug 31640)
This seems to have stopped working with some GCC 14 versions, which clobber r2. With other compilers, the kernel-provided r2 value is still available at this point. Reviewed-by: Peter Bergner <bergner@linux.ibm.com> (cherry picked from commit 14e56bd4ce15ac2d1cc43f762eb2e6b83fec1afe)
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 3a4a21a412..997f73ea54 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -79,6 +79,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr) static inline Elf64_Addr elf_machine_load_address (void) __attribute__ ((const)); +#ifndef __PCREL__ static inline Elf64_Addr elf_machine_load_address (void) { @@ -106,6 +107,24 @@ elf_machine_dynamic (void) /* Then subtract off the load address offset. */ return runtime_dynamic - elf_machine_load_address() ; } +#else /* __PCREL__ */ +/* In PCREL mode, r2 may have been clobbered. Rely on relative + relocations instead. */ + +static inline ElfW(Addr) +elf_machine_load_address (void) +{ + extern const ElfW(Ehdr) __ehdr_start attribute_hidden; + return (ElfW(Addr)) &__ehdr_start; +} + +static inline ElfW(Addr) +elf_machine_dynamic (void) +{ + extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; + return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); +} +#endif /* __PCREL__ */ /* The PLT uses Elf64_Rela relocs. */ #define elf_machine_relplt elf_machine_rela |