diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-06-29 23:36:11 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-06-29 23:36:11 -0400 |
| commit | 2c0e54ff32dedae504a34d1f551b4a1f69c3130a (patch) | |
| tree | 964c39c11b08366c181522c198df60f39ae0d1a8 | |
| parent | cf3b23ffcd95841f1d36a3c808c415b41d70b3a9 (diff) | |
| parent | 751626f948f28d39713e0690fd9aa751a74eaab0 (diff) | |
| download | glibc-2c0e54ff32dedae504a34d1f551b4a1f69c3130a.tar.gz glibc-2c0e54ff32dedae504a34d1f551b4a1f69c3130a.tar.xz glibc-2c0e54ff32dedae504a34d1f551b4a1f69c3130a.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/generic/dl-irel.h | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 16187bb087..48c7586c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ are re-adding the entry. * nscd/servicescache.c (cache_addserv): Likewise. +2011-06-30 Aurelien Jarno <aurelien@aurel32.net> + + * sysdeps/generic/dl-irel.h: fix protection against multiple + inclusions. + * sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New. + 2011-06-28 Ulrich Drepper <drepper@gmail.com> [BZ #12935] diff --git a/sysdeps/generic/dl-irel.h b/sysdeps/generic/dl-irel.h index 4d7b481e81..62fa1ce9ce 100644 --- a/sysdeps/generic/dl-irel.h +++ b/sysdeps/generic/dl-irel.h @@ -17,7 +17,14 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _DL_IREL_h +#ifndef _DL_IREL_H #define _DL_IREL_H +static inline DL_FIXUP_VALUE_TYPE +__attribute ((always_inline)) +elf_ifunc_invoke (ElfW(Addr) addr) +{ + return ((DL_FIXUP_VALUE_TYPE (*) (void)) (addr)) (); +} + #endif /* dl-irel.h */ |