r4784 - in glibc-package/trunk/debian: . patches patches/powerpc
Author: aurel32
Date: 2011-07-03 23:46:29 +0000 (Sun, 03 Jul 2011)
New Revision: 4784
Added:
glibc-package/trunk/debian/patches/powerpc/submitted-ifunc.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/powerpc/submitted-ifunc.diff to fix build on powerpc.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-03 21:15:10 UTC (rev 4783)
+++ glibc-package/trunk/debian/changelog 2011-07-03 23:46:29 UTC (rev 4784)
@@ -19,6 +19,7 @@
libc during upgrades. Closes: #632190, #632509.
* Install arch dependent headers in the multiarch include directory, patch by
Marcin Juszkiewicz. Tag libc*-dev as Multi-Arch: same.
+ * Add patches/powerpc/submitted-ifunc.diff to fix build on powerpc.
-- Samuel Thibault <sthibault@debian.org> Thu, 30 Jun 2011 09:52:43 +0200
Added: glibc-package/trunk/debian/patches/powerpc/submitted-ifunc.diff
===================================================================
--- glibc-package/trunk/debian/patches/powerpc/submitted-ifunc.diff (rev 0)
+++ glibc-package/trunk/debian/patches/powerpc/submitted-ifunc.diff 2011-07-03 23:46:29 UTC (rev 4784)
@@ -0,0 +1,50 @@
+2011-07-04 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion
+ protection macro.
+ * sysdeps/powerpc/powerpc64/dl-irel.h(Elf64_FuncDesc): include
+ <ldsodefs.h> and <dl-machine.h>.
+ * sysdeps/powerpc/powerpc64/dl-irel.h(Elf64_FuncDesc): remove.
+
+diff --git a/sysdeps/powerpc/dl-tls.h b/sysdeps/powerpc/dl-tls.h
+index 9ab81f9..5fd1b23 100644
+--- a/sysdeps/powerpc/dl-tls.h
++++ b/sysdeps/powerpc/dl-tls.h
+@@ -17,6 +17,8 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef _PPC_DL_TLS_H
++# define _PPC_DL_TLS_H 1
+
+ /* Type used for the representation of TLS information in the TOC. */
+ typedef struct
+@@ -50,3 +52,5 @@ extern void *__tls_get_addr (tls_index *ti);
+
+ /* Value used for dtv entries for which the allocation is delayed. */
+ #define TLS_DTV_UNALLOCATED ((void *) -1l)
++
++#endif /* dl-tls.h */
+diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64/dl-irel.h
+index 3c2668f..56e1cc5 100644
+--- a/sysdeps/powerpc/powerpc64/dl-irel.h
++++ b/sysdeps/powerpc/powerpc64/dl-irel.h
+@@ -23,16 +23,11 @@
+
+ #include <stdio.h>
+ #include <unistd.h>
++#include <ldsodefs.h>
++#include <dl-machine.h>
+
+ #define ELF_MACHINE_IRELA 1
+
+-typedef struct
+-{
+- Elf64_Addr fd_func;
+- Elf64_Addr fd_toc;
+- Elf64_Addr fd_aux;
+-} Elf64_FuncDesc;
+-
+ static inline Elf64_Addr
+ __attribute ((always_inline))
+ elf_ifunc_invoke (Elf64_Addr addr)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-07-03 21:15:10 UTC (rev 4783)
+++ glibc-package/trunk/debian/patches/series 2011-07-03 23:46:29 UTC (rev 4784)
@@ -270,3 +270,4 @@
#any/cvs-resolv-different-nameserver.diff
any/cvs-fnmatch.diff
any/cvs-ifunc.diff
+powerpc/submitted-ifunc.diff
Reply to: