[oe-commits] Khem Raj : uclibc-nptl: Move to latest revision.

[git version control]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Thu Oct  1 23:15:43 2009 -0700

uclibc-nptl: Move to latest revision.

* Add needed fixes to get uclibc nptl compiling.

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/uclibc/uclibc-nptl/uClibc.distro           |    1 +
 .../uclibc_arm_remove_duplicate_sysdep_defs.patch  |   53 ++++++++++++++++++++
 recipes/uclibc/uclibc_git.bb                       |    2 +-
 recipes/uclibc/uclibc_nptl.bb                      |    4 +-
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/recipes/uclibc/uclibc-nptl/uClibc.distro b/recipes/uclibc/uclibc-nptl/uClibc.distro
index e52db5c..cd1ee35 100644
--- a/recipes/uclibc/uclibc-nptl/uClibc.distro
+++ b/recipes/uclibc/uclibc-nptl/uClibc.distro
@@ -55,6 +55,7 @@ UCLIBC_HAS_FULL_RPC=y
 # UCLIBC_HAS_REENTRANT_RPC is not set
 # UCLIBC_USE_NETLINK is not set
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_RESOLV_STUB=y
 
 #
 # String and Stdio Support
diff --git a/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch b/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
new file mode 100644
index 0000000..c871534
--- /dev/null
+++ b/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
@@ -0,0 +1,53 @@
+--- a/libc/sysdeps/linux/common/Makefile.in.org	2009-09-30 17:22:18.652679321 -0700
++++ a/libc/sysdeps/linux/common/Makefile.in	2009-09-30 17:21:15.599669303 -0700
+@@ -92,6 +92,10 @@ ifeq ($(TARGET_ARCH),i386)
+ CSRC := $(filter-out vfork.c,$(CSRC))
+ endif
+ 
++ifeq ($(TARGET_ARCH),arm)
++CSRC := $(filter-out syscall.c,$(CSRC))
++endif
++
+ # fails for some reason
+ ifneq ($(strip $(ARCH_OBJS)),)
+ CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
+--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h.orig	2009-09-30 17:12:46.571672582 -0700
++++ a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h	2009-09-30 17:10:12.255037520 -0700
+@@ -273,37 +273,6 @@ __local_syscall_error:						\
+ #undef INTERNAL_SYSCALL_ERRNO
+ #define INTERNAL_SYSCALL_ERRNO(val, err)	(-(val))
+ 
+-#define LOAD_ARGS_0()
+-#define ASM_ARGS_0
+-#define LOAD_ARGS_1(a1)				\
+-  _a1 = (int) (a1);				\
+-  LOAD_ARGS_0 ()
+-#define ASM_ARGS_1	ASM_ARGS_0, "r" (_a1)
+-#define LOAD_ARGS_2(a1, a2)			\
+-  register int _a2 __asm__ ("a2") = (int) (a2);	\
+-  LOAD_ARGS_1 (a1)
+-#define ASM_ARGS_2	ASM_ARGS_1, "r" (_a2)
+-#define LOAD_ARGS_3(a1, a2, a3)			\
+-  register int _a3 __asm__ ("a3") = (int) (a3);	\
+-  LOAD_ARGS_2 (a1, a2)
+-#define ASM_ARGS_3	ASM_ARGS_2, "r" (_a3)
+-#define LOAD_ARGS_4(a1, a2, a3, a4)		\
+-  register int _a4 __asm__ ("a4") = (int) (a4);	\
+-  LOAD_ARGS_3 (a1, a2, a3)
+-#define ASM_ARGS_4	ASM_ARGS_3, "r" (_a4)
+-#define LOAD_ARGS_5(a1, a2, a3, a4, a5)		\
+-  register int _v1 __asm__ ("v1") = (int) (a5);	\
+-  LOAD_ARGS_4 (a1, a2, a3, a4)
+-#define ASM_ARGS_5	ASM_ARGS_4, "r" (_v1)
+-#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)	\
+-  register int _v2 __asm__ ("v2") = (int) (a6);	\
+-  LOAD_ARGS_5 (a1, a2, a3, a4, a5)
+-#define ASM_ARGS_6	ASM_ARGS_5, "r" (_v2)
+-#define LOAD_ARGS_7(a1, a2, a3, a4, a5, a6, a7)	\
+-  register int _v3 __asm__ ("v3") = (int) (a7);	\
+-  LOAD_ARGS_6 (a1, a2, a3, a4, a5, a6)
+-#define ASM_ARGS_7	ASM_ARGS_6, "r" (_v3)
+-
+ #if defined(__ARM_EABI__)
+ #undef INTERNAL_SYSCALL_NCS
+ #define INTERNAL_SYSCALL_NCS(number, err, nr, args...)		\
diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index cdc5ae1..af0c650 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="6625518cd6894338937a74ca6b9187b7b8167b03"
+SRCREV="b364abfd3f728894120996d5da2565614132708f"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index afb6347..0652c6a 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="d57e6548d253a9efed91d72498aeda092fa265d2"
+SRCREV="072687ae9c54b55659431a5bd395d9956096ddea"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -32,8 +32,8 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
 	file://uClibc.machine \
 	file://uClibc.distro \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
-	file://uclibc_ldso_use_O0.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+	file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \
 	"
 
 S = "${WORKDIR}/git"