summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-07-19 13:13:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 16:19:14 +0100
commita921c2f9dbefde3592bfe65c80ff1ce973aac89b (patch)
tree26b492438631afde3c24b777ed7f960a750c26d7 /meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch
parent161d036569c17d28a1ce625a1c2e258fb6cb18c3 (diff)
downloadpoky-a921c2f9dbefde3592bfe65c80ff1ce973aac89b.tar.gz
ltp: upgrade 20190115 -> 20190517
Drop the following patches since the issues have been fixed upstream: 0001-file01.sh-Fix-in-was-not-recognized.patch 0001-lapi-Define-TST_ABI-32-64-to-detect-target-type.patch 0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch 0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch 0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch 0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch 0026-crash01-Define-_GNU_SOURCE.patch 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch 0034-periodic_output.patch 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch define-sigrtmin-and-sigrtmax-for-musl.patch setregid01-security-string-formatting.patch Refresh the following patches: 0004-build-Add-option-to-select-libc-implementation.patch 0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch 0018-guard-mallocopt-with-__GLIBC__.patch 0020-getdents-define-getdents-getdents64-only-for-glibc.patch 0035-fix-test_proc_kill-hang.patch 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch 0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch 0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch 0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch Add patch: 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (From OE-Core rev: eb59546c83f4c217de6272a8d3b2fa65e3c84e7f) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch b/meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch
new file mode 100644
index 0000000000..d1f7b0746b
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0005-getdents-define-getdents-getdents64-only-for-glibc.patch
@@ -0,0 +1,50 @@
1From b996b2480fe3a800ffbdc4a0fdc5e8775c575449 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Jan 2016 06:57:04 +0000
4Subject: [PATCH] getdents: define getdents/getdents64 only for glibc
5
6getdents/getdents64 are implemented in musl and when we define static
7functions with same name, it errors out.
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 testcases/kernel/syscalls/getdents/getdents.h | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16diff --git a/testcases/kernel/syscalls/getdents/getdents.h b/testcases/kernel/syscalls/getdents/getdents.h
17index 702b0bd..860b22e 100644
18--- a/testcases/kernel/syscalls/getdents/getdents.h
19+++ b/testcases/kernel/syscalls/getdents/getdents.h
20@@ -34,12 +34,13 @@ struct linux_dirent {
21 char d_name[];
22 };
23
24+#ifdef __GLIBC__
25 static inline int
26 getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size)
27 {
28 return ltp_syscall(__NR_getdents, fd, dirp, size);
29 }
30-
31+#endif
32 struct linux_dirent64 {
33 uint64_t d_ino;
34 int64_t d_off;
35@@ -48,10 +49,11 @@ struct linux_dirent64 {
36 char d_name[];
37 };
38
39+#ifdef __GLIBC__
40 static inline int
41 getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size)
42 {
43 return ltp_syscall(__NR_getdents64, fd, dirp64, size);
44 }
45-
46+#endif
47 #endif /* GETDENTS_H */
48--
492.7.4
50