uclibc: Upgrade to tip of master

Drop upstreamed patches convert the rest to git am'able patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

23 files changed, 944 insertions, 1685 deletions

diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 3c489406d9..14a577f432 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,30 +1,20 @@
-SRCREV = "48a0006012679ff0eda6f256da958d73a924fb57"
+SRCREV = "ca1c74d67dd115d059a875150e10b8560a9c35a8"
 
 PV = "0.9.33+git${SRCPV}"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/uclibc-git:"
 
 SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
-	file://uClibc.machine \
-	file://uClibc.distro \
-	file://obstack.cfg \
-	file://locale.cfg \
-	file://uclibc_enable_log2_test.patch \
-	file://powerpc_copysignl.patch \
-	file://argp-support.patch \
-	file://argp-headers.patch \
-	file://remove_attribute_optimize_Os.patch \
-	file://compile-arm-fork-with-O2.patch \
-	file://0001-ldso-limited-support-for-ORIGIN-in-rpath.patch \
-	file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \
-	file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \
-	file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
-	file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
-	file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
-	file://0001-Add-eventfd_read-and-eventfd_write.patch \
-	file://0002-wire-setns-syscall.patch \
-	file://0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch \
-	file://0001-timex-Sync-with-glibc.patch \
-	file://ldso-mark-_dl_exit-as-noreturn.patch \
-	"
+        file://uClibc.machine \
+        file://uClibc.distro \
+        file://obstack.cfg \
+        file://locale.cfg \
+        file://0001-Disable-lrount_tes-function.patch \
+        file://0002-Add-implementation-for-copysignl-for-ppc.patch \
+        file://0003-Add-argp-implementation.patch \
+        file://0004-Dont-support-localised-optimizations-this-helps-to-h.patch \
+        file://0005-Always-use-O2-for-compiling-fork.c.patch \
+        file://0006-ldso-limited-support-for-ORIGIN-in-rpath.patch \
+        file://0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
+"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch
deleted file mode 100644
index dd0efc0f36..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From e3aae24ede969e2dede1aa19c2ee520cab71ce11 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 20 Feb 2014 00:30:18 -0800
-Subject: [PATCH 1/3] Add eventfd_read() and eventfd_write()
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- libc/sysdeps/linux/common/Makefile.in     |  2 ++
- libc/sysdeps/linux/common/eventfd_read.c  | 27 +++++++++++++++++++++++++++
- libc/sysdeps/linux/common/eventfd_write.c | 28 ++++++++++++++++++++++++++++
- libc/sysdeps/linux/common/sys/eventfd.h   |  4 ----
- 4 files changed, 57 insertions(+), 4 deletions(-)
- create mode 100644 libc/sysdeps/linux/common/eventfd_read.c
- create mode 100644 libc/sysdeps/linux/common/eventfd_write.c
-
-diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
-index dbf0b0f..45d2e21 100644
---- a/libc/sysdeps/linux/common/Makefile.in
-+++ b/libc/sysdeps/linux/common/Makefile.in
-@@ -25,6 +25,8 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += \
- 	capset.c \
- 	dup3.c \
- 	eventfd.c \
-+	eventfd_read.c \
-+	eventfd_write.c \
- 	inotify.c \
- 	ioperm.c \
- 	iopl.c \
-diff --git a/libc/sysdeps/linux/common/eventfd_read.c b/libc/sysdeps/linux/common/eventfd_read.c
-new file mode 100644
-index 0000000..75f2aaa
---- /dev/null
-+++ b/libc/sysdeps/linux/common/eventfd_read.c
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2007-2014 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/eventfd.h>
-+
-+
-+int
-+eventfd_read (int fd, eventfd_t *value)
-+{
-+  return read (fd, value, sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
-+}
-diff --git a/libc/sysdeps/linux/common/eventfd_write.c b/libc/sysdeps/linux/common/eventfd_write.c
-new file mode 100644
-index 0000000..e1509cf
---- /dev/null
-+++ b/libc/sysdeps/linux/common/eventfd_write.c
-@@ -0,0 +1,28 @@
-+/* Copyright (C) 2007-2014 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/eventfd.h>
-+
-+
-+int
-+eventfd_write (int fd, eventfd_t value)
-+{
-+  return write (fd, &value,
-+		sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
-+}
-diff --git a/libc/sysdeps/linux/common/sys/eventfd.h b/libc/sysdeps/linux/common/sys/eventfd.h
-index 1bf785f..91b265b 100644
---- a/libc/sysdeps/linux/common/sys/eventfd.h
-+++ b/libc/sysdeps/linux/common/sys/eventfd.h
-@@ -33,16 +33,12 @@ __BEGIN_DECLS
-    value to COUNT.  */
- extern int eventfd (int __count, int __flags) __THROW;
- 
--#if 0 /* not (yet) implemented in uClibc */
--
- /* Read event counter and possibly wait for events.  */
- extern int eventfd_read (int __fd, eventfd_t *__value);
- 
- /* Increment event counter.  */
- extern int eventfd_write (int __fd, eventfd_t __value);
- 
--#endif
--
- __END_DECLS
- 
- #endif /* sys/eventfd.h */
--- 
-1.9.0
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch
deleted file mode 100644
index d613823695..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From be8ed13a90c528adfbe3c8543946bb2c5a2ad713 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Aug 2014 15:50:36 -0700
-Subject: [PATCH] Define IPTOS_CLASS_* macros according to RFC 2474
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-status: Pending
----
- include/netinet/ip.h | 42 ++++++++++++++++++++++++++++++------------
- 1 file changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/include/netinet/ip.h b/include/netinet/ip.h
-index 19e1249..3fe58b9 100644
---- a/include/netinet/ip.h
-+++ b/include/netinet/ip.h
-@@ -188,7 +188,25 @@ struct ip_timestamp
- #define	IPTOS_DSCP_EF		0xb8
- 
- /*
-- * Definitions for IP type of service (ip_tos)
-+ * In RFC 2474, Section 4.2.2.1, the Class Selector Codepoints subsume
-+ * the old ToS Precedence values.
-+ */
-+#define	IPTOS_CLASS_MASK		0xe0
-+#define	IPTOS_CLASS(class)		((class) & IPTOS_CLASS_MASK)
-+#define	IPTOS_CLASS_CS0			0x00
-+#define	IPTOS_CLASS_CS1			0x20
-+#define	IPTOS_CLASS_CS2			0x40
-+#define	IPTOS_CLASS_CS3			0x60
-+#define	IPTOS_CLASS_CS4			0x80
-+#define	IPTOS_CLASS_CS5			0xa0
-+#define	IPTOS_CLASS_CS6			0xc0
-+#define	IPTOS_CLASS_CS7			0xe0
-+
-+#define	IPTOS_CLASS_DEFAULT		IPTOS_CLASS_CS0
-+
-+/*
-+ * Definitions for IP type of service (ip_tos) [deprecated; use DSCP
-+ * and CS definitions above instead.]
-  */
- #define	IPTOS_TOS_MASK		0x1E
- #define	IPTOS_TOS(tos)		((tos) & IPTOS_TOS_MASK)
-@@ -199,18 +217,18 @@ struct ip_timestamp
- #define	IPTOS_MINCOST		IPTOS_LOWCOST
- 
- /*
-- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
-+ * Definitions for IP precedence (also in ip_tos) [also deprecated.]
-  */
--#define	IPTOS_PREC_MASK			0xe0
--#define	IPTOS_PREC(tos)                ((tos) & IPTOS_PREC_MASK)
--#define	IPTOS_PREC_NETCONTROL		0xe0
--#define	IPTOS_PREC_INTERNETCONTROL	0xc0
--#define	IPTOS_PREC_CRITIC_ECP		0xa0
--#define	IPTOS_PREC_FLASHOVERRIDE	0x80
--#define	IPTOS_PREC_FLASH		0x60
--#define	IPTOS_PREC_IMMEDIATE		0x40
--#define	IPTOS_PREC_PRIORITY		0x20
--#define	IPTOS_PREC_ROUTINE		0x00
-+#define	IPTOS_PREC_MASK			IPTOS_CLASS_MASK
-+#define	IPTOS_PREC(tos)			IPTOS_CLASS(tos)
-+#define	IPTOS_PREC_NETCONTROL		IPTOS_CLASS_CS7
-+#define	IPTOS_PREC_INTERNETCONTROL	IPTOS_CLASS_CS6
-+#define	IPTOS_PREC_CRITIC_ECP		IPTOS_CLASS_CS5
-+#define	IPTOS_PREC_FLASHOVERRIDE	IPTOS_CLASS_CS4
-+#define	IPTOS_PREC_FLASH		IPTOS_CLASS_CS3
-+#define	IPTOS_PREC_IMMEDIATE		IPTOS_CLASS_CS2
-+#define	IPTOS_PREC_PRIORITY		IPTOS_CLASS_CS1
-+#define	IPTOS_PREC_ROUTINE		IPTOS_CLASS_CS0
- 
- /*
-  * Definitions for options.
--- 
-2.1.0
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch
new file mode 100644
index 0000000000..506f146a79
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch
@@ -0,0 +1,37 @@
+From 14b865b3438d0df29b4969148678d8fa8943e1ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 16 Aug 2015 20:49:33 -0700
+Subject: [PATCH 1/7] Disable lrount_tes() function
+
+Its not used anyway, avoids some strict compiler warnings
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Pending
+
+ test/math/libm-test.inc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/test/math/libm-test.inc b/test/math/libm-test.inc
+index f50b48b..6d70a95 100644
+--- a/test/math/libm-test.inc
++++ b/test/math/libm-test.inc
+@@ -3470,7 +3470,6 @@ logb_test (void)
+ }
+ 
+ 
+-#if 0
+ static void
+ lround_test (void)
+ {
+@@ -3605,7 +3604,6 @@ llround_test (void)
+ 
+   END (llround);
+ }
+-#endif
+ 
+ static void
+ modf_test (void)
+-- 
+2.1.4
+
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
deleted file mode 100644
index 4ac765c334..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream-Status: Pending
-
-From 096abf14d2dc978607ccd8a0d7f42da65d8991f3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 9 Sep 2012 22:00:04 -0700
-Subject: [PATCH] Revert "utent.c, wtent.c: move functions from utxent.c"
-
-This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18.
----
- include/utmp.h          |    8 +++++
- libc/misc/utmp/utent.c  |   80 +++++++++++------------------------------------
- libc/misc/utmp/utxent.c |    4 +--
- libc/misc/utmp/wtent.c  |   14 ++-------
- 4 files changed, 30 insertions(+), 76 deletions(-)
-
-Index: git/include/utmp.h
-===================================================================
---- git.orig/include/utmp.h	2013-01-21 16:37:18.000000000 -0800
-+++ git/include/utmp.h	2013-01-21 16:40:56.987583099 -0800
-@@ -56,30 +56,37 @@
- /* Append entry UTMP to the wtmp-like file WTMP_FILE.  */
- extern void updwtmp (const char *__wtmp_file, const struct utmp *__utmp)
-      __THROW;
-+libc_hidden_proto(updwtmp)
- 
- /* Change name of the utmp file to be examined.  */
- extern int utmpname (const char *__file) __THROW;
-+libc_hidden_proto(utmpname)
- 
- /* Read next entry from a utmp-like file.  */
- extern struct utmp *getutent (void) __THROW;
-+libc_hidden_proto(getutent)
- 
- /* Reset the input stream to the beginning of the file.  */
- extern void setutent (void) __THROW;
-+libc_hidden_proto(setutent)
- 
- /* Close the current open file.  */
- extern void endutent (void) __THROW;
-+libc_hidden_proto(endutent)
- 
- /* Search forward from the current point in the utmp file until the
-    next entry with a ut_type matching ID->ut_type.  */
- extern struct utmp *getutid (const struct utmp *__id) __THROW;
-+libc_hidden_proto(getutid)
- 
- /* Search forward from the current point in the utmp file until the
-    next entry with a ut_line matching LINE->ut_line.  */
- extern struct utmp *getutline (const struct utmp *__line) __THROW;
-+libc_hidden_proto(getutline)
- 
- /* Write out entry pointed to by UTMP_PTR into the utmp file.  */
- extern struct utmp *pututline (const struct utmp *__utmp_ptr) __THROW;
--
-+libc_hidden_proto(pututline)
- 
- #if 0 /* def	__USE_MISC */
- /* Reentrant versions of the file for handling utmp files.  */
-Index: git/libc/misc/utmp/utent.c
-===================================================================
---- git.orig/libc/misc/utmp/utent.c	2013-01-21 16:37:18.000000000 -0800
-+++ git/libc/misc/utmp/utent.c	2013-01-21 16:38:14.035578638 -0800
-@@ -19,9 +19,6 @@
- #include <errno.h>
- #include <string.h>
- #include <utmp.h>
--#ifdef __UCLIBC_HAS_UTMPX__
--# include <utmpx.h>
--#endif
- #include <not-cancel.h>
- 
- #include <bits/uClibc_mutex.h>
-@@ -34,7 +31,7 @@
- static const char *static_ut_name = default_file_name;
- 
- /* This function must be called with the LOCK held */
--static void __setutent_unlocked(void)
-+static void __setutent(void)
- {
-     if (static_fd < 0) {
- 	static_fd = open_not_cancel_2(static_ut_name, O_RDWR | O_CLOEXEC);
-@@ -53,24 +50,19 @@
-     lseek(static_fd, 0, SEEK_SET);
- }
- #if defined __UCLIBC_HAS_THREADS__
--static void __setutent(void)
-+void setutent(void)
- {
-     __UCLIBC_MUTEX_LOCK(utmplock);
--    __setutent_unlocked();
-+    __setutent();
-     __UCLIBC_MUTEX_UNLOCK(utmplock);
- }
- #else
--static void __setutent(void);
--strong_alias(__setutent_unlocked,__setutent)
--#endif
- strong_alias(__setutent,setutent)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--strong_alias(__setutent,setutxent)
- #endif
-+libc_hidden_def(setutent)
- 
- /* This function must be called with the LOCK held */
--static struct utmp *__getutent_unlocked(void)
-+static struct utmp *__getutent(void)
- {
-     if (static_fd < 0) {
- 	__setutent();
-@@ -86,27 +78,19 @@
-     return NULL;
- }
- #if defined __UCLIBC_HAS_THREADS__
--static struct utmp *__getutent(void)
-+struct utmp *getutent(void)
- {
-     struct utmp *ret;
- 
-     __UCLIBC_MUTEX_LOCK(utmplock);
--    ret = __getutent_unlocked();
-+    ret = __getutent();
-     __UCLIBC_MUTEX_UNLOCK(utmplock);
-     return ret;
- }
- #else
--static struct utmp *__getutent(void);
--strong_alias(__getutent_unlocked,__getutent)
--#endif
- strong_alias(__getutent,getutent)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--struct utmpx *getutxent(void)
--{
--	return (struct utmpx *) __getutent ();
--}
- #endif
-+libc_hidden_def(getutent)
- 
- static void __endutent(void)
- {
-@@ -117,13 +101,10 @@
-     __UCLIBC_MUTEX_UNLOCK(utmplock);
- }
- strong_alias(__endutent,endutent)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--strong_alias(__endutent,endutxent)
--#endif
-+libc_hidden_def(endutent)
- 
- /* This function must be called with the LOCK held */
--static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry)
-+static struct utmp *__getutid(const struct utmp *utmp_entry)
- {
-     struct utmp *lutmp;
-     unsigned type;
-@@ -133,7 +114,7 @@
-     type = utmp_entry->ut_type - 1;
-     type /= 4;
- 
--    while ((lutmp = __getutent_unlocked()) != NULL) {
-+    while ((lutmp = __getutent()) != NULL) {
- 	if (type == 0 && lutmp->ut_type == utmp_entry->ut_type)	{
- 	    /* one of RUN_LVL, BOOT_TIME, NEW_TIME, OLD_TIME */
- 	    return lutmp;
-@@ -147,34 +128,26 @@
-     return NULL;
- }
- #if defined __UCLIBC_HAS_THREADS__
--static struct utmp *__getutid(const struct utmp *utmp_entry)
-+struct utmp *getutid(const struct utmp *utmp_entry)
- {
-     struct utmp *ret;
- 
-     __UCLIBC_MUTEX_LOCK(utmplock);
--    ret = __getutid_unlocked(utmp_entry);
-+    ret = __getutid(utmp_entry);
-     __UCLIBC_MUTEX_UNLOCK(utmplock);
-     return ret;
- }
- #else
--static struct utmp *__getutid(const struct utmp *utmp_entry);
--strong_alias(__getutid_unlocked,__getutid)
--#endif
- strong_alias(__getutid,getutid)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--struct utmpx *getutxid(const struct utmpx *utmp_entry)
--{
--	return (struct utmpx *) __getutid ((const struct utmp *) utmp_entry);
--}
- #endif
-+libc_hidden_def(getutid)
- 
- static struct utmp *__getutline(const struct utmp *utmp_entry)
- {
-     struct utmp *lutmp;
- 
-     __UCLIBC_MUTEX_LOCK(utmplock);
--    while ((lutmp = __getutent_unlocked()) != NULL) {
-+    while ((lutmp = __getutent()) != NULL) {
- 	if (lutmp->ut_type == USER_PROCESS || lutmp->ut_type == LOGIN_PROCESS) {
- 	    if (strncmp(lutmp->ut_line, utmp_entry->ut_line, sizeof(lutmp->ut_line)) == 0) {
- 		break;
-@@ -185,13 +158,7 @@
-     return lutmp;
- }
- strong_alias(__getutline,getutline)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--struct utmpx *getutxline(const struct utmpx *utmp_entry)
--{
--	return (struct utmpx *) __getutline ((const struct utmp *) utmp_entry);
--}
--#endif
-+libc_hidden_def(getutline)
- 
- static struct utmp *__pututline(const struct utmp *utmp_entry)
- {
-@@ -200,7 +167,7 @@
-        the file pointer where they want it, everything will work out. */
-     lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
- 
--    if (__getutid_unlocked(utmp_entry) != NULL)
-+    if (__getutid(utmp_entry) != NULL)
- 	lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
-     else
- 	lseek(static_fd, (off_t) 0, SEEK_END);
-@@ -211,13 +178,7 @@
-     return (struct utmp *)utmp_entry;
- }
- strong_alias(__pututline,pututline)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--struct utmpx *pututxline (const struct utmpx *utmp_entry)
--{
--	return (struct utmpx *) __pututline ((const struct utmp *) utmp_entry);
--}
--#endif
-+libc_hidden_def(pututline)
- 
- static int __utmpname(const char *new_ut_name)
- {
-@@ -241,7 +202,4 @@
-     return 0; /* or maybe return -(static_ut_name != new_ut_name)? */
- }
- strong_alias(__utmpname,utmpname)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--strong_alias(__utmpname,utmpxname)
--#endif
-+libc_hidden_def(utmpname)
-Index: git/libc/misc/utmp/utxent.c
-===================================================================
---- git.orig/libc/misc/utmp/utxent.c	2013-01-21 16:37:18.000000000 -0800
-+++ git/libc/misc/utmp/utxent.c	2013-01-21 16:38:14.035578638 -0800
-@@ -13,7 +13,6 @@
- #include <utmpx.h>
- #include <utmp.h>
- 
--#if 0 /* moved to utent.c */
- void setutxent(void)
- {
- 	setutent ();
-@@ -49,12 +48,10 @@
- 	return utmpname (new_ut_name);
- }
- 
--/* moved to wtent.c */
- void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx)
- {
- 	updwtmp (wtmpx_file, (const struct utmp *) utmpx);
- }
--#endif
- 
- /* Copy the information in UTMPX to UTMP. */
- void getutmp (const struct utmpx *utmpx, struct utmp *utmp)
-@@ -107,3 +104,4 @@
- 	utmpx->ut_time = utmp->ut_time;
- #endif
- }
-+
-Index: git/libc/misc/utmp/wtent.c
-===================================================================
---- git.orig/libc/misc/utmp/wtent.c	2013-01-21 16:37:18.000000000 -0800
-+++ git/libc/misc/utmp/wtent.c	2013-01-21 16:38:14.035578638 -0800
-@@ -11,9 +11,6 @@
- #include <time.h>
- #include <unistd.h>
- #include <utmp.h>
--#ifdef __UCLIBC_HAS_UTMPX__
--# include <utmpx.h>
--#endif
- #include <fcntl.h>
- #include <sys/file.h>
- #include <not-cancel.h>
-@@ -36,7 +33,7 @@
- }
- #endif
- 
--static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp)
-+void updwtmp(const char *wtmp_file, const struct utmp *lutmp)
- {
-     int fd;
- 
-@@ -49,11 +46,4 @@
- 	}
-     }
- }
--strong_alias(__updwtmp,updwtmp)
--
--#ifdef __UCLIBC_HAS_UTMPX__
--void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx)
--{
--	__updwtmp (wtmpx_file, (const struct utmp *) utmpx);
--}
--#endif
-+libc_hidden_def(updwtmp)
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch b/meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
deleted file mode 100644
index b6dfce483e..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 74667582526b39a1906228574d73a6528f4587eb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 23 Jun 2012 13:26:30 -0700
-Subject: [PATCH] atexit_old: Do not add it to shared libc
-
-atexit should only be in either uclibc_nonshared.a
-shared libc case or libc.a in static build case
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- libc/stdlib/Makefile.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
-index 3166b8e..3d686d9 100644
---- a/libc/stdlib/Makefile.in
-+++ b/libc/stdlib/Makefile.in
-@@ -60,7 +60,6 @@ CSRC-$(if $(findstring yyy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_HAS_WCHAR)$(UCLIBC_HAS_X
- 
- # multi source _atexit.c
- CSRC-y += __cxa_atexit.c __cxa_finalize.c __exit_handler.c exit.c on_exit.c
--CSRC-$(COMPAT_ATEXIT) += old_atexit.c
- 
- STDLIB_DIR := $(top_srcdir)libc/stdlib
- STDLIB_OUT := $(top_builddir)libc/stdlib
-@@ -70,11 +69,12 @@ STDLIB_OBJ := $(patsubst %.c,$(STDLIB_OUT)/%.o,$(CSRC-y))
- 
- libc-y += $(STDLIB_OBJ)
- libc-static-y += $(STDLIB_OUT)/atexit.o $(STDLIB_OUT)/system.o
-+libc-static-$(COMPAT_ATEXIT) += $(STDLIB_OUT)/old_atexit.o
- libc-shared-y += $(STDLIB_OUT)/system.oS
- 
- # this should always be the PIC version, because it could be used in shared libs
- libc-nonshared-y += $(STDLIB_OUT)/atexit.os
--
-+libc-nonshared-$(COMPAT_ATEXIT) += $(STDLIB_OUT)/old_atexit.os
- libc-nomulti-y += $(STDLIB_OUT)/labs.o $(STDLIB_OUT)/atol.o $(STDLIB_OUT)/_stdlib_strto_l.o $(STDLIB_OUT)/_stdlib_strto_ll.o
- libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STDLIB_OUT)/_stdlib_strto_l_l.o $(STDLIB_OUT)/_stdlib_strto_ll_l.o
- 
--- 
-1.7.9.5
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch b/meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
deleted file mode 100644
index ecb9d31645..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 95f9b6f37152b8316735d3c86c0db963ff59e22d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 23 Jun 2012 16:51:52 -0700
-Subject: [PATCH] librt: Use -nodefaultlibs instead of -nostdlib
-
-nostdlib disables linking in startup files too which is not
-what we want here since it needs to resolve __dso_handle
-which comes from crtbeginS.o, otherwise librt has this
-undefined reference to a weak undefined __dso_handle that
-shows up as error (with gold linker)
-when shared libraries are being built which are
-linking in librt
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- librt/Makefile.in |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: git/librt/Makefile.in
-===================================================================
---- git.orig/librt/Makefile.in	2012-06-24 10:32:59.512653237 -0700
-+++ git/librt/Makefile.in	2012-06-24 11:31:00.660821666 -0700
-@@ -15,6 +15,9 @@
- ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
- LIBS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so
- endif
-+START_FILE-librt.so := $(SHARED_START_FILES)
-+END_FILE-librt.so := $(SHARED_END_FILES)
-+
- 
- librt_FULL_NAME := librt-$(VERSION).so
- 
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
deleted file mode 100644
index 7e7c5793f1..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 714f543f4fa8fb3911449b6ce1517481359e0cff Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 23 Jun 2012 14:21:17 -0700
-Subject: [PATCH] nptl/arm: Move aeabi_read_tp to uclibc_nonshared.a
-
-Otherwise it creates wrong references from shared libs
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- libc/sysdeps/linux/arm/Makefile.arch |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: git/libc/sysdeps/linux/arm/Makefile.arch
-===================================================================
---- git.orig/libc/sysdeps/linux/arm/Makefile.arch	2013-05-23 11:13:32.000000000 -0700
-+++ git/libc/sysdeps/linux/arm/Makefile.arch	2013-05-23 11:16:18.304333131 -0700
-@@ -13,7 +13,9 @@
- 	vfork.S clone.S
- 
- SSRC-$(UCLIBC_HAS_LFS) += mmap64.S
--SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-aeabi_read_tp.S libc-thumb_atomics.S
-+SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S
-+libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os
-+libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o
- CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c
- SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S
- 
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
deleted file mode 100644
index 297a40bd04..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From d021e6252b33e779857846714fb1899a25c9965d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 23 Jun 2012 15:59:01 -0700
-Subject: [PATCH] nptl/atfork: Hide pthread_atfork in shared versions
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- libpthread/nptl/Makefile.in      |    4 +++-
- libpthread/nptl/pthread_atfork.c |   12 ++++++++++--
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
-index 158bcae..3ef7175 100644
---- a/libpthread/nptl/Makefile.in
-+++ b/libpthread/nptl/Makefile.in
-@@ -16,6 +16,7 @@ libc-shared-routines-y = forward.c libc-cancellation.c
- libc-static-routines-y = alloca_cutoff.c libc-cancellation.c
- libpthread-shared-only-routines-y = version.c
- libpthread-static-only-routines-y = pthread_atfork.c
-+
- libpthread-routines- += $(notdir $(wildcard $(libpthread_DIR)/gen_*.c)) # dummy generated files
- libpthread-routines- += allocatestack.c # dummy included by pthread_create.c
- libpthread-routines- += pthread_mutex_getprioceiling.c pthread_mutex_setprioceiling.c # XXX: delete those or use them!
-@@ -208,7 +209,7 @@ CFLAGS-msgsnd.c = -fexceptions -fasynchronous-unwind-tables
-