[oe-commits] Dmitry Eremin-Solenikov : glibc-2.9: fix builds for arm-oabi

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7b60863bdf8020ef3419fc09d85ae4babbe97b12
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7b60863bdf8020ef3419fc09d85ae4babbe97b12

Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Fri Jun 19 21:22:26 2009 +0400

glibc-2.9: fix builds for arm-oabi

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

---

 recipes/glibc/files/arm-check-pf.patch             |   14 ++++++++++++++
 .../glibc/files/arm-lowlevellock-include-tls.patch |   12 ++++++++++++
 recipes/glibc/files/local-args6.diff               |   12 ++++++++++++
 recipes/glibc/glibc_2.9.bb                         |    3 +++
 4 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/recipes/glibc/files/arm-check-pf.patch b/recipes/glibc/files/arm-check-pf.patch
new file mode 100644
index 0000000..b9c7226
--- /dev/null
+++ b/recipes/glibc/files/arm-check-pf.patch
@@ -0,0 +1,14 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/check_pf.c	2009-06-19 20:45:32.451372131 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c	2009-06-19 20:45:51.351313426 +0400
+@@ -207,9 +207,6 @@
+ 		      newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+ 					   ? in6ai_deprecated : 0)
+ 					  | ((ifam->ifa_flags
+-					      & IFA_F_TEMPORARY)
+-					     ? in6ai_temporary : 0)
+-					  | ((ifam->ifa_flags
+ 					      & IFA_F_HOMEADDRESS)
+ 					     ? in6ai_homeaddress : 0));
+ 		      memcpy (newp->info.addr, address ?: local,
diff --git a/recipes/glibc/files/arm-lowlevellock-include-tls.patch b/recipes/glibc/files/arm-lowlevellock-include-tls.patch
new file mode 100644
index 0000000..5c8062e
--- /dev/null
+++ b/recipes/glibc/files/arm-lowlevellock-include-tls.patch
@@ -0,0 +1,12 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-06-19 20:54:35.446686910 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-06-19 20:54:43.774683370 +0400
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+ 
+ #define FUTEX_WAIT		0
+ #define FUTEX_WAKE		1
diff --git a/recipes/glibc/files/local-args6.diff b/recipes/glibc/files/local-args6.diff
new file mode 100644
index 0000000..28c957f
--- /dev/null
+++ b/recipes/glibc/files/local-args6.diff
@@ -0,0 +1,12 @@
+--- glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+@@ -73,6 +73,9 @@
+ # define DOCARGS_5	DOCARGS_4
+ # define UNDOCARGS_5	UNDOCARGS_4
+ 
++# define DOCARGS_6	DOCARGS_5
++# define UNDOCARGS_6	UNDOCARGS_5
++
+ # ifdef IS_IN_libpthread
+ #  define CENABLE	bl PLTJMP(__pthread_enable_asynccancel)
+ #  define CDISABLE	bl PLTJMP(__pthread_disable_asynccancel)
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index e84c1b9..be66e2b 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -54,6 +54,9 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
 	   file://glibc-check_pf.patch;patch=1;pnum=0 \
            file://ldd-unbash.patch;patch=1 \
 	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://local-args6.diff;patch=1 \
+	   file://arm-check-pf.patch;patch=1 \
+	   file://arm-lowlevellock-include-tls.patch;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \