uclibc-nptl: Update to latest top of upstream branch.

* Drop upstream merged patches.

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

3 files changed, 1 insertions, 92 deletions

diff --git a/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch b/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch
deleted file mode 100644
index 383050e6e8..0000000000
--- a/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 46d7539bb38c9811a65c9953e81369c4d070ee8b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jan 2010 15:17:09 -0800
-Subject: [PATCH] Makefile.arch: On ARM and MIPS pass -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-
-* This will prevent it using internal __libc* symbols in pthread which
-  should be hidden for libc only use.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch |    1 +
- .../sysdeps/unix/sysv/linux/mips/Makefile.arch     |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
-===================================================================
---- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch	2010-01-26 20:38:45.000000000 -0800
-+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch	2010-01-26 21:13:54.215450487 -0800
-@@ -16,7 +16,9 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
- CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
- endif
- CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- CFLAGS-lowlevellock.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_error.c =  -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
- ASFLAGS-pt-vfork.S = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 -marm
- # We always compile it in arm mode because of SAVE_PID macro
-Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
-===================================================================
---- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2010-01-26 20:38:45.000000000 -0800
-+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2010-01-26 20:41:19.455424645 -0800
-@@ -15,6 +15,7 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
- CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
- endif
- CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
- ASFLAGS-pt-vfork.S = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
diff --git a/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch b/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch
deleted file mode 100644
index 2c83b5720f..0000000000
--- a/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b1ab3c351b8715e1228ec4b9d602c04296d758ea Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jan 2010 15:11:05 -0800
-Subject: [PATCH] errno: hide __libc_resp, __libc_errno, and __libc_h_errno
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/inet/resolv.c          |    2 +-
- libc/misc/internals/errno.c |    5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index 4087f8d..ee1323e 100644
---- a/libc/inet/resolv.c
-+++ b/libc/inet/resolv.c
-@@ -3018,7 +3018,7 @@ __thread struct __res_state *__resp = &_res;
-  *        relocations.
-  */
- extern __thread struct __res_state *__libc_resp
--       __attribute__ ((alias ("__resp")));
-+       __attribute__ ((alias ("__resp"))) attribute_hidden;
- # else
- #  undef __resp
- struct __res_state *__resp = &_res;
-diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
-index e1b5d7e..11d19ee 100644
---- a/libc/misc/internals/errno.c
-+++ b/libc/misc/internals/errno.c
-@@ -4,15 +4,14 @@
- __thread int errno;
- __thread int h_errno;
- 
--extern __thread int __libc_errno __attribute__ ((alias ("errno")));
--extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno")));
-+extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden;
-+extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden;
- #define h_errno __libc_h_errno
- 
- #else
- #include "internal_errno.h"
- int errno = 0;
- int h_errno = 0;
--
- #ifdef __UCLIBC_HAS_THREADS__
- libc_hidden_def(errno)
- weak_alias(errno, _errno)
--- 
-1.6.3.3
-
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index df0962aa62..c9d9e3b0a7 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="b7b81eb5484d1a37d8672e7be2aa4462df5d0aaf"
+SRCREV="f50a678f473e44c405e51af988a57daf88ea2f27"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -34,8 +34,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
 	file://uclibc-arm-ftruncate64.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 \
-	file://errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch;patch=1 \
-	file://Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch;patch=1 \
 	"
 
 S = "${WORKDIR}/git"