From 751626f948f28d39713e0690fd9aa751a74eaab0 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 29 Jun 2011 05:00:49 -0700 Subject: Fix build with multiarch disabled. --- ChangeLog | 6 ++++++ sysdeps/generic/dl-irel.h | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b4d30ca33a..2060482301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-30 Aurelien Jarno + + * sysdeps/generic/dl-irel.h: fix protection against multiple + inclusions. + * sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New. + 2011-06-28 Ulrich Drepper [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 */ -- cgit v1.2.3