diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:37:38 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:37:38 +0000 |
commit | b1115227b87a24137310c566f5f8a53cf182796e (patch) | |
tree | 820fae46cf56ad6bb657e43fb93a7a078a42dd7c /libc/sysdeps/powerpc | |
parent | 2f4cad8d89b656684e8829b2e164070515d4d34b (diff) | |
download | eglibc2-b1115227b87a24137310c566f5f8a53cf182796e.tar.gz |
Merge changes between r14127 and r14282 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@14283 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/powerpc')
-rw-r--r-- | libc/sysdeps/powerpc/powerpc32/dl-irel.h | 9 | ||||
-rw-r--r-- | libc/sysdeps/powerpc/powerpc64/dl-irel.h | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libc/sysdeps/powerpc/powerpc32/dl-irel.h b/libc/sysdeps/powerpc/powerpc32/dl-irel.h index 3f204cd7a..a31e1edd4 100644 --- a/libc/sysdeps/powerpc/powerpc32/dl-irel.h +++ b/libc/sysdeps/powerpc/powerpc32/dl-irel.h @@ -26,6 +26,13 @@ #define ELF_MACHINE_IRELA 1 +static inline Elf32_Addr +__attribute ((always_inline)) +elf_ifunc_invoke (Elf32_Addr addr) +{ + return ((Elf32_Addr (*) (void)) (addr)) (); +} + static inline void __attribute ((always_inline)) elf_irela (const Elf32_Rela *reloc) @@ -35,7 +42,7 @@ elf_irela (const Elf32_Rela *reloc) if (__builtin_expect (r_type == R_PPC_IRELATIVE, 1)) { Elf32_Addr *const reloc_addr = (void *) reloc->r_offset; - Elf32_Addr value = ((Elf32_Addr (*) (void)) reloc->r_addend) (); + Elf32_Addr value = elf_ifunc_invoke(reloc->r_addend); *reloc_addr = value; } else diff --git a/libc/sysdeps/powerpc/powerpc64/dl-irel.h b/libc/sysdeps/powerpc/powerpc64/dl-irel.h index 6cded5091..3c2668fbb 100644 --- a/libc/sysdeps/powerpc/powerpc64/dl-irel.h +++ b/libc/sysdeps/powerpc/powerpc64/dl-irel.h @@ -33,6 +33,13 @@ typedef struct Elf64_Addr fd_aux; } Elf64_FuncDesc; +static inline Elf64_Addr +__attribute ((always_inline)) +elf_ifunc_invoke (Elf64_Addr addr) +{ + return ((Elf64_Addr (*) (void)) (addr)) (); +} + static inline void __attribute ((always_inline)) elf_irela (const Elf64_Rela *reloc) @@ -42,13 +49,13 @@ elf_irela (const Elf64_Rela *reloc) if (__builtin_expect (r_type == R_PPC64_IRELATIVE, 1)) { Elf64_Addr *const reloc_addr = (void *) reloc->r_offset; - Elf64_Addr value = ((Elf64_Addr (*) (void)) reloc->r_addend) (); + Elf64_Addr value = elf_ifunc_invoke(reloc->r_addend); *reloc_addr = value; } else if (__builtin_expect (r_type == R_PPC64_JMP_IREL, 1)) { Elf64_Addr *const reloc_addr = (void *) reloc->r_offset; - Elf64_Addr value = ((Elf64_Addr (*) (void)) reloc->r_addend) (); + Elf64_Addr value = elf_ifunc_invoke(reloc->r_addend); *(Elf64_FuncDesc *) reloc_addr = *(Elf64_FuncDesc *) value; } else |