diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2011-06-21 14:19:45 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2011-06-21 14:19:45 +0000 |
| commit | 5411b5632debd0c53902e82a9cd6e9fa0e8787ea (patch) | |
| tree | b67925719f2733fe877329450693e2572b688948 | |
| parent | 6cc02c7aaedec87cfb2d105f9682b12b2154e54f (diff) | |
| download | glibc-5411b5632debd0c53902e82a9cd6e9fa0e8787ea.tar.xz glibc-5411b5632debd0c53902e82a9cd6e9fa0e8787ea.zip | |
Define elf_ifunc_invoke for ARM.
| -rw-r--r-- | ChangeLog.arm | 5 | ||||
| -rw-r--r-- | sysdeps/arm/dl-irel.h | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm index 30405dd108..1737b24d06 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,8 @@ +2011-06-21 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/arm/dl-irel.h (elf_ifunc_invoke): New. + (elf_irel): Use it. + 2010-06-20 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New. diff --git a/sysdeps/arm/dl-irel.h b/sysdeps/arm/dl-irel.h index 735e0a3ad6..ab33ef8393 100644 --- a/sysdeps/arm/dl-irel.h +++ b/sysdeps/arm/dl-irel.h @@ -1,6 +1,6 @@ /* Machine-dependent ELF indirect relocation inline functions. ARM version. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011 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 @@ -26,6 +26,13 @@ #define ELF_MACHINE_IREL 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_irel (const Elf32_Rel *reloc) @@ -35,7 +42,7 @@ elf_irel (const Elf32_Rel *reloc) if (__builtin_expect (r_type == R_ARM_IRELATIVE, 1)) { - Elf32_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) (); + Elf32_Addr value = elf_ifunc_invoke (*reloc_addr); *reloc_addr = value; } else |
