r4766 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2011-06-29 12:30:32 +0000 (Wed, 29 Jun 2011)
New Revision: 4766
Modified:
glibc-package/trunk/debian/patches/any/cvs-ifunc.diff
Log:
Update cvs-ifunc.diff from upstream
Modified: glibc-package/trunk/debian/patches/any/cvs-ifunc.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ifunc.diff 2011-06-28 21:11:38 UTC (rev 4765)
+++ glibc-package/trunk/debian/patches/any/cvs-ifunc.diff 2011-06-29 12:30:32 UTC (rev 4766)
@@ -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-20 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple
@@ -301,3 +307,23 @@
*reloc_addr = value;
}
else
+diff --git a/sysdeps/generic/dl-irel.h b/sysdeps/generic/dl-irel.h
+index 4d7b481..62fa1ce 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 */
Reply to: