r4754 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2011-06-27 20:39:33 +0000 (Mon, 27 Jun 2011)
New Revision: 4754
Modified:
glibc-package/trunk/debian/patches/any/cvs-ifunc.diff
Log:
cvs-ifunc: don't backport ifunc changes for arm, as the support has been
added post-2.13
Modified: glibc-package/trunk/debian/patches/any/cvs-ifunc.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ifunc.diff 2011-06-27 20:33:21 UTC (rev 4753)
+++ glibc-package/trunk/debian/patches/any/cvs-ifunc.diff 2011-06-27 20:39:33 UTC (rev 4754)
@@ -1,8 +1,3 @@
-2011-06-21 Joseph Myers <joseph@codesourcery.com>
-
- * ports/sysdeps/arm/dl-irel.h (elf_ifunc_invoke): New.
- (elf_irel): Use it.
-
2011-06-20 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple
@@ -306,30 +301,3 @@
*reloc_addr = value;
}
else
-diff --git a/ports/sysdeps/arm/dl-irel.h b/ports/sysdeps/arm/dl-irel.h
-index 735e0a3..ab33ef8 100644
---- a/ports/sysdeps/arm/dl-irel.h
-+++ b/ports/sysdeps/arm/dl-irel.h
-@@ -26,6 +26,13 @@
-
- #define ELF_MACHINE_IREL 1
-
-+static inline Elf32_Addr
-+__attribute ((always_inline))
-+elf_ifunc_invoke (Elf32_Addr addr)
-+{
-+ return ((Elf32_Addr (*) (void)) (addr)) ();
-+}
-+
- static inline void
- __attribute ((always_inline))
- elf_irel (const Elf32_Rel *reloc)
-@@ -35,7 +42,7 @@ elf_irel (const Elf32_Rel *reloc)
-
- if (__builtin_expect (r_type == R_ARM_IRELATIVE, 1))
- {
-- Elf32_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) ();
-+ Elf32_Addr value = elf_ifunc_invoke (*reloc_addr);
- *reloc_addr = value;
- }
- else
Reply to: