summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
deleted file mode 100644
index df3e8831f5..0000000000
--- a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 7 Jan 2016 19:40:08 +0000
4Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it
5
6__GLIBC_PREREQ is specific to glibc so it should be checked if it is
7defined or not.
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
13
14---
15 testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++
16 1 file changed, 7 insertions(+)
17
18diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
19index 29e18f27d..07444a46f 100644
20--- a/testcases/kernel/syscalls/accept4/accept4_01.c
21+++ b/testcases/kernel/syscalls/accept4/accept4_01.c
22@@ -38,6 +38,7 @@
23 static struct sockaddr_in *conn_addr, *accept_addr;
24 static int listening_fd;
25
26+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
27 #if !(__GLIBC_PREREQ(2, 10))
28 static int
29 accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
30@@ -56,6 +57,7 @@ accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
31 #endif
32 }
33 #endif
34+#endif
35
36 static int create_listening_socket(void)
37 {
38@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr)
39 SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr));
40 addrlen = sizeof(*accept_addr);
41
42+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
43 #if !(__GLIBC_PREREQ(2, 10))
44 TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
45 tcase->cloexec | tcase->nonblock));
46 #else
47 TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
48 tcase->cloexec | tcase->nonblock));
49+#endif
50+#else
51+ TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
52+ tcase->cloexec | tcase->nonblock));
53 #endif
54 if (TST_RET == -1) {
55 if (TST_ERR == ENOSYS)