aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-16 06:50:55 +0000
committerKhem Raj <raj.khem@gmail.com>2014-02-17 09:22:38 -0800
commite114cc405bd98ebbe5376e094842c9d49e7ca9b8 (patch)
tree49be45873550446ec293e07313fea236dabb2efd
parent0ee08a02e0750b6184e7e8f6906c1d3b31282178 (diff)
downloadopenembedded-core-contrib-misc.tar.gz
openembedded-core-contrib-misc.tar.bz2
openembedded-core-contrib-misc.zip
uclibc: Update to git tipmisc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-core/uclibc/uclibc-git.inc3
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch68
2 files changed, 1 insertions, 70 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 2005ae19e9..f2a125601c 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,4 +1,4 @@
-SRCREV="f22cca4722fa66e424562e69f4afa2bca0af871d"
+SRCREV="19f21a1d974d802f05c43e4cabd6ed6891a8ae50"
PV = "0.9.33+git${SRCPV}"
@@ -21,6 +21,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
- file://0001-add-posix_fadvise-for-arm.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch b/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch
deleted file mode 100644
index 7c17a19420..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 236a65abe0a6810e20498fc0ba8d02d90978953b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 29 Jun 2013 22:46:53 -0700
-Subject: [PATCH] add posix_fadvise() for arm
-
-arm call to posix_fadvise simply calls posix_fadvise64
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/sysdeps/linux/common/posix_fadvise.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-Upstream-Status: Pending
-
-diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c
-index d3e1bd4..e102ce7 100644
---- a/libc/sysdeps/linux/common/posix_fadvise.c
-+++ b/libc/sysdeps/linux/common/posix_fadvise.c
-@@ -10,30 +10,38 @@
-
- #include <sys/syscall.h>
-
--#ifdef __NR_fadvise64
-+#if defined(__NR_fadvise64) || defined(__NR_arm_fadvise64_64)
- # include <fcntl.h>
- # include <endian.h>
- # include <bits/wordsize.h>
-
-+# ifdef __NR_arm_fadvise64_64
-+int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice);
-+# endif
-+
- int posix_fadvise(int fd, off_t offset, off_t len, int advice)
- {
-+# ifdef __NR_arm_fadvise64_64
-+ return posix_fadvise64(fd, offset, len, advice);
-+# else
- int ret;
- INTERNAL_SYSCALL_DECL(err);
--# if __WORDSIZE == 64
-+# if __WORDSIZE == 64
- ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice);
--# else
--# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
-- ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
- # else
-+# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
-+ ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
-+# else
- ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd,
--# endif
-+# endif
- OFF_HI_LO (offset), len, advice);
--# endif
-+# endif
- if (INTERNAL_SYSCALL_ERROR_P (ret, err))
- return INTERNAL_SYSCALL_ERRNO (ret, err);
- return 0;
-+# endif
- }
--# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64)
-+# if defined __UCLIBC_HAS_LFS__ && ((!defined __NR_fadvise64_64 && !defined __NR_arm_fadvise64_64) || __WORDSIZE == 64)
- strong_alias(posix_fadvise,posix_fadvise64)
- # endif
- #endif
---
-1.7.9.5
-