[gentoo-commits] gentoo commit in src/patchsets/glibc/2.11: 6130_all_ppc-glibc-2.11-cell-vector.patch 6900_all_glibc-2.11-ia64-ifunc.patch README.history

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      09/11/06 21:14:42

  Modified:             README.history
  Added:                6130_all_ppc-glibc-2.11-cell-vector.patch
                        6900_all_glibc-2.11-ia64-ifunc.patch
  Log:
  add patches for ppc/ia64 build errors

Revision  Changes    Path
1.3                  src/patchsets/glibc/2.11/README.history

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/README.history?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/README.history?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/README.history?r1=1.2&r2=1.3

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.11/README.history,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.history	6 Nov 2009 14:20:40 -0000	1.2
+++ README.history	6 Nov 2009 21:14:41 -0000	1.3
@@ -1,5 +1,7 @@
-2		[pending]
+2		06.11.2009
 	+ 0055_all_bug-regex29-add-missing-stdio.h-include.patch
+	+ 6130_all_ppc-glibc-2.11-cell-vector.patch
+	+ 6900_all_glibc-2.11-ia64-ifunc.patch
 
 1		05.11.2009
 	+ 0030_all_glibc-respect-env-CPPFLAGS.patch



1.1                  src/patchsets/glibc/2.11/6130_all_ppc-glibc-2.11-cell-vector.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/6130_all_ppc-glibc-2.11-cell-vector.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/6130_all_ppc-glibc-2.11-cell-vector.patch?rev=1.1&content-type=text/plain

Index: 6130_all_ppc-glibc-2.11-cell-vector.patch
===================================================================
http://sourceware.org/ml/libc-alpha/2009-11/msg00017.html

From: Petr Baudis <pasky at suse dot cz>
To: libc-alpha at sourceware dot org
Date: Fri, 6 Nov 2009 12:03:59 +0100
Subject: Fix compilation with Altivec

(This is essentially the same as Andreas Schwab's similar change in Oct
2004. glibc-2.11 fails to build with -mcpu=cell, where __vector is
gcc-reserved keyword.)

2009-11-06  Petr Baudis <pasky@suse.cz>

	* include/sys/uio.h: Change __vector to __iovec to avoid clash
	with altivec.

diff --git a/include/sys/uio.h b/include/sys/uio.h
index 8c2b016..bfaec59 100644
--- a/include/sys/uio.h
+++ b/include/sys/uio.h
@@ -2,12 +2,12 @@
 #include <misc/sys/uio.h>
 
 /* Now define the internal interfaces.  */
-extern ssize_t __readv (int __fd, __const struct iovec *__vector,
+extern ssize_t __readv (int __fd, __const struct iovec *__iovec,
 			int __count);
-extern ssize_t __libc_readv (int __fd, __const struct iovec *__vector,
+extern ssize_t __libc_readv (int __fd, __const struct iovec *__iovec,
 			     int __count);
-extern ssize_t __writev (int __fd, __const struct iovec *__vector,
+extern ssize_t __writev (int __fd, __const struct iovec *__iovec,
 			 int __count);
-extern ssize_t __libc_writev (int __fd, __const struct iovec *__vector,
+extern ssize_t __libc_writev (int __fd, __const struct iovec *__iovec,
 			      int __count);
 #endif



1.1                  src/patchsets/glibc/2.11/6900_all_glibc-2.11-ia64-ifunc.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/6900_all_glibc-2.11-ia64-ifunc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.11/6900_all_glibc-2.11-ia64-ifunc.patch?rev=1.1&content-type=text/plain

Index: 6900_all_glibc-2.11-ia64-ifunc.patch
===================================================================
http://sourceware.org/ml/libc-alpha/2009-11/msg00001.html

From: "H.J. Lu" <hongjiu dot lu at intel dot com>
To: GNU C Library <libc-alpha at sourceware dot org>
Date: Sun, 1 Nov 2009 09:34:18 -0800
Subject: PATCH: Properly handle STT_GNU_IFUNC symbols in do_sym

do_sym should use DL_FIXUP_VALUE_XXX macros to call IFUNC function.
Otherwise, it won't compile on ia64. This patch fixes it and adds
a test.


H.J.
----
2009-11-01  H.J. Lu  <hongjiu.lu@intel.com>

	* elf/dl-sym.c (do_sym): Properly handle STT_GNU_IFUNC symbols.

	* elf/ifuncmain3.c (main): Test dlopen STT_GNU_IFUNC symbol.

diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 459729f..0fa3b3a 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -193,8 +193,13 @@ RTLD_NEXT used in code not dynamically loaded"));
 
       /* Resolve indirect function address.  */
       if (__builtin_expect (ELFW(ST_TYPE) (ref->st_info) == STT_GNU_IFUNC, 0))
-	value
-	  = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
+	{
+	  DL_FIXUP_VALUE_TYPE fixup
+	    = DL_FIXUP_MAKE_VALUE (result, (ElfW(Addr)) value);
+	  fixup = 
+	    ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (fixup)) ();
+	  value = (void *) DL_FIXUP_VALUE_CODE_ADDR (fixup);
+	}
 
 #ifdef SHARED
       /* Auditing checkpoint: we have a new binding.  Provide the
diff --git a/elf/ifuncmain3.c b/elf/ifuncmain3.c
index 5d067cc..1574dd5 100644
--- a/elf/ifuncmain3.c
+++ b/elf/ifuncmain3.c
@@ -46,6 +46,15 @@ main (void)
       return 1;
     }
 
+  p = dlsym (h, "foo");
+  if (p == NULL)
+    {
+      printf ("symbol not found: %s\n", dlerror ());
+      return 1;
+    }
+  if ((*p) () != -1)
+    abort ();
+
   f = dlsym (h, "get_foo_p");
   if (f == NULL)
     {