Fix build with multiarch disabled.

diff --git a/ChangeLog b/ChangeLog
index b4d30ca33a4316c3203d183019527f6a5f26266a..20604823014f2e02efe41af4a693b4863b325586 100644 (file)
--- 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 4d7b481e812778cf6615e97c154f4773631f2f44..62fa1ce9ce4d84e6dd22ce8fc63ad0a40f614eec 100644 (file)
--- 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 */