summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-16 06:50:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-18 08:38:52 (GMT)
commit3f9334b89fe2e8b55e9a5a9de99f33dd28d93c4a (patch)
tree36083dd9ca52a3ad9ceeda010cf8546bf1751847
parenta8daee2fe41d633013e2f5e3e30556f1790072ca (diff)
downloadpoky-3f9334b89fe2e8b55e9a5a9de99f33dd28d93c4a.tar.gz
uclibc: Update to git tip
(From OE-Core rev: 4c280911373abb8021b1fea6e136df8b4cabdea3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 2005ae1..f2a1256 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,4 +1,4 @@
1SRCREV="f22cca4722fa66e424562e69f4afa2bca0af871d" 1SRCREV="19f21a1d974d802f05c43e4cabd6ed6891a8ae50"
2 2
3PV = "0.9.33+git${SRCPV}" 3PV = "0.9.33+git${SRCPV}"
4 4
@@ -21,6 +21,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
21 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ 21 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
22 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \ 22 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
23 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ 23 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
24 file://0001-add-posix_fadvise-for-arm.patch \
25 " 24 "
26S = "${WORKDIR}/git" 25S = "${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 7c17a19..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 236a65abe0a6810e20498fc0ba8d02d90978953b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 29 Jun 2013 22:46:53 -0700
4Subject: [PATCH] add posix_fadvise() for arm
5
6arm call to posix_fadvise simply calls posix_fadvise64
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 libc/sysdeps/linux/common/posix_fadvise.c | 24 ++++++++++++++++--------
11 1 file changed, 16 insertions(+), 8 deletions(-)
12
13Upstream-Status: Pending
14
15diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c
16index d3e1bd4..e102ce7 100644
17--- a/libc/sysdeps/linux/common/posix_fadvise.c
18+++ b/libc/sysdeps/linux/common/posix_fadvise.c
19@@ -10,30 +10,38 @@
20
21 #include <sys/syscall.h>
22
23-#ifdef __NR_fadvise64
24+#if defined(__NR_fadvise64) || defined(__NR_arm_fadvise64_64)
25 # include <fcntl.h>
26 # include <endian.h>
27 # include <bits/wordsize.h>
28
29+# ifdef __NR_arm_fadvise64_64
30+int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice);
31+# endif
32+
33 int posix_fadvise(int fd, off_t offset, off_t len, int advice)
34 {
35+# ifdef __NR_arm_fadvise64_64
36+ return posix_fadvise64(fd, offset, len, advice);
37+# else
38 int ret;
39 INTERNAL_SYSCALL_DECL(err);
40-# if __WORDSIZE == 64
41+# if __WORDSIZE == 64
42 ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice);
43-# else
44-# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
45- ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
46 # else
47+# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
48+ ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
49+# else
50 ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd,
51-# endif
52+# endif
53 OFF_HI_LO (offset), len, advice);
54-# endif
55+# endif
56 if (INTERNAL_SYSCALL_ERROR_P (ret, err))
57 return INTERNAL_SYSCALL_ERRNO (ret, err);
58 return 0;
59+# endif
60 }
61-# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64)
62+# if defined __UCLIBC_HAS_LFS__ && ((!defined __NR_fadvise64_64 && !defined __NR_arm_fadvise64_64) || __WORDSIZE == 64)
63 strong_alias(posix_fadvise,posix_fadvise64)
64 # endif
65 #endif
66--
671.7.9.5
68