diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-06-29 05:00:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-29 05:00:49 -0700 |
| commit | 751626f948f28d39713e0690fd9aa751a74eaab0 (patch) | |
| tree | 52598fe1ce4b87af3b488e9ba4ced227680d6186 | |
| parent | 5c0b8d9013560bb24805844d31a7fb3959ee1e8d (diff) | |
| download | glibc-751626f948f28d39713e0690fd9aa751a74eaab0.tar.gz glibc-751626f948f28d39713e0690fd9aa751a74eaab0.tar.xz glibc-751626f948f28d39713e0690fd9aa751a74eaab0.zip | |
Fix build with multiarch disabled.
| -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 b4d30ca33a..2060482301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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 */ |