From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 29 Jun 2011 12:00:49 +0000 (-0700)
Subject: Fix build with multiarch disabled.
X-Git-Tag: glibc-2.15~498^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751626f948f28d39713e0690fd9aa751a74eaab0;p=thirdparty%2Fglibc.git

Fix build with multiarch disabled.
---

diff --git a/ChangeLog b/ChangeLog
index b4d30ca33a4..20604823014 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 4d7b481e812..62fa1ce9ce4 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 */