[gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/, ...

[Anthony G. Basile]

commit:     08cef68c75f0523120260fb30ee8cecb31268d7a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 21:24:44 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 21:24:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=08cef68c

tools-uclibc: update patches for uclibc-0.9.33.2-r8

---
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 .../patches/sys-libs/uclibc/00_fix-eventfd.patch   |  59 ------
 .../sys-libs/uclibc/03-pread_pwrite-backport.patch | 215 ---------------------
 ...d-isfdtype.patch => 99-libc-add-isfdtype.patch} |   0
 30 files changed, 2740 deletions(-)

diff --git a/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.amd64.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.amd64.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.armv7a.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.armv7a.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.i686.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.i686.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.mipsel3.hardened/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

diff --git a/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
deleted file mode 100644
index cfc64de..0000000
--- a/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@×××××.com>
-Date: Sun, 10 Jun 2012 16:36:23 +0000
-Subject: eventfd: Implement eventfd2 and fix eventfd
-
-eventfd: evntfd assumes to take two arguments instead it
-should be one evntfd expects two therefore implement both syscalls with
-correct parameters
-
-Thanks Eugene Rudoy for reporting it and also providing the patch
-
-Signed-off-by: Khem Raj <raj.khem@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
-index cc3f3f0..96597ab 100644
---- a/libc/sysdeps/linux/common/eventfd.c
-+++ b/libc/sysdeps/linux/common/eventfd.c
-@@ -7,12 +7,24 @@
-  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-  */
- 
-+#include <errno.h>
- #include <sys/syscall.h>
- #include <sys/eventfd.h>
- 
- /*
-  * eventfd()
-  */
--#ifdef __NR_eventfd
--_syscall2(int, eventfd, int, count, int, flags)
-+#if defined __NR_eventfd || defined __NR_eventfd2
-+int eventfd (int count, int flags)
-+{
-+#if defined __NR_eventfd2
-+  return INLINE_SYSCALL (eventfd2, 2, count, flags);
-+#elif defined __NR_eventfd
-+  if (flags != 0) {
-+     __set_errno (EINVAL);
-+    return -1;
-+  }
-+  return INLINE_SYSCALL (eventfd, 1, count);
-+#endif
-+}
- #endif
-diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
-index 3567b07..1fc2393 100644
---- a/libc/sysdeps/linux/common/stubs.c
-+++ b/libc/sysdeps/linux/common/stubs.c
-@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
- make_stub(epoll_wait)
- #endif
- 
--#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
-+#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
- make_stub(eventfd)
- #endif
- 
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch b/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
deleted file mode 100644
index 7ea9486..0000000
--- a/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/03-pread_pwrite-backport.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <natanael.copa@×××××.com>
-Date: Sat, 04 Aug 2012 17:32:45 +0000
-Subject: pread/pwrite: backport fix
-
-pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
-
-There was a fallback function using lseek for kernels who did not have
-this syscall (pre 2.1.60). This is broken in many ways.
-
-uclibc have been using the broken fallback due to they forgot to rename
-pread syscall.
-
-This got detected with git-1.7.11 which introduced threaded index-pack
-which broke in similar ways a windows (msys).
-
-This issue in uclibc have been reported upstream and fixed in git master
-so this patch does not need to be upstreamed. It might be an idea to
-backport it properly for 0.9.33 branch though.
-
-Signed-off-by: Natanael Copa <natanael.copa@×××××.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com>
----
-diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
-index 88e6957..baf8691 100644
---- a/libc/sysdeps/linux/common/pread_write.c
-+++ b/libc/sysdeps/linux/common/pread_write.c
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <endian.h>
-+#include <sysdep-cancel.h>
- 
- extern __typeof(pread) __libc_pread;
- extern __typeof(pwrite) __libc_pwrite;
-@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
- 
- #include <bits/kernel_types.h>
- 
--#ifdef __NR_pread
--
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
- {
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
-+
- }
- weak_alias(__libc_pread,pread)
- 
-@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pread64,pread64)
- # endif /* __UCLIBC_HAS_LFS__  */
- 
--#endif /* __NR_pread */
--
--#ifdef __NR_pwrite
--
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
- 		size_t, count, off_t, offset_hi, off_t, offset_lo)
- 
- ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
- {
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
-+	LIBC_CANCEL_RESET (oldtype);
-+	return result;
- }
- weak_alias(__libc_pwrite,pwrite)
- 
-@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
- {
- 	uint32_t low = offset & 0xffffffff;
- 	uint32_t high = offset >> 32;
--	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
--}
--weak_alias(__libc_pwrite64,pwrite64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* __NR_pwrite */
--
--#if ! defined __NR_pread || ! defined __NR_pwrite
--
--static ssize_t __fake_pread_write(int fd, void *buf,
--		size_t count, off_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position.  If this fails we
--	 * have to return this as an error.  */
--	save_errno = errno;
--	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
--	{
--		if (result == -1)
--			__set_errno(save_errno);
--		return -1;
--	}
--	__set_errno(save_errno);
--	return(result);
--}
--
--# ifdef __UCLIBC_HAS_LFS__
--
--static ssize_t __fake_pread_write64(int fd, void *buf,
--		size_t count, off64_t offset, int do_pwrite)
--{
--	int save_errno;
--	ssize_t result;
--	off64_t old_offset;
--
--	/* Since we must not change the file pointer preserve the
--	 * value so that we can restore it later.  */
--	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
--		return -1;
--
--	/* Set to wanted position.  */
--	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
--		return -1;
--
--	if (do_pwrite == 1) {
--		/* Write the data.  */
--		result = write(fd, buf, count);
--	} else {
--		/* Read the data.  */
--		result = read(fd, buf, count);
--	}
--
--	/* Now we have to restore the position. */
--	save_errno = errno;
--	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
--		if (result == -1)
--			__set_errno (save_errno);
--		return -1;
--	}
--	__set_errno (save_errno);
-+	int oldtype = LIBC_CANCEL_ASYNC ();
-+	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
-+	LIBC_CANCEL_RESET (oldtype);
- 	return result;
- }
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
--
--#ifndef __NR_pread
--ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
--{
--	return __fake_pread_write(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread,pread)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, buf, count, offset, 0);
--}
--weak_alias(__libc_pread64,pread64)
--# endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pread */
--
--#ifndef __NR_pwrite
--ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
--{
--	/* we won't actually be modifying the buffer,
--	 *just cast it to get rid of warnings */
--	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
--}
--weak_alias(__libc_pwrite,pwrite)
--
--# ifdef __UCLIBC_HAS_LFS__
--ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
--{
--	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
--}
- weak_alias(__libc_pwrite64,pwrite64)
- # endif /* __UCLIBC_HAS_LFS__  */
--#endif /* ! __NR_pwrite */
---
-cgit v0.9.1

diff --git a/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch b/tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
similarity index 100%
rename from tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/02-libc-add-isfdtype.patch
rename to tools-uclibc/portage.mipsel3.vanilla/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch