diff options
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.patch | 27 |
1 files changed, 12 insertions, 15 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 index c0f69ecf5f..df3e8831f5 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 | 1 | From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 7 Jan 2016 19:40:08 +0000 | 3 | Date: Thu, 7 Jan 2016 19:40:08 +0000 |
4 | Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it | 4 | Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it |
@@ -10,16 +10,17 @@ Upstream-Status: Pending | |||
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ | 15 | testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ |
15 | 1 file changed, 7 insertions(+) | 16 | 1 file changed, 7 insertions(+) |
16 | 17 | ||
17 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c | 18 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c |
18 | index dd289cf..76aa969 100644 | 19 | index 29e18f27d..07444a46f 100644 |
19 | --- a/testcases/kernel/syscalls/accept4/accept4_01.c | 20 | --- a/testcases/kernel/syscalls/accept4/accept4_01.c |
20 | +++ b/testcases/kernel/syscalls/accept4/accept4_01.c | 21 | +++ b/testcases/kernel/syscalls/accept4/accept4_01.c |
21 | @@ -38,6 +38,7 @@ | 22 | @@ -38,6 +38,7 @@ |
22 | static struct sockaddr_in conn_addr; | 23 | static struct sockaddr_in *conn_addr, *accept_addr; |
23 | static int listening_fd; | 24 | static int listening_fd; |
24 | 25 | ||
25 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) | 26 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644 | |||
34 | 35 | ||
35 | static int create_listening_socket(void) | 36 | static int create_listening_socket(void) |
36 | { | 37 | { |
37 | @@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) | 38 | @@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr) |
38 | SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr)); | 39 | SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr)); |
39 | addrlen = sizeof(claddr); | 40 | addrlen = sizeof(*accept_addr); |
40 | 41 | ||
41 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) | 42 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
42 | #if !(__GLIBC_PREREQ(2, 10)) | 43 | #if !(__GLIBC_PREREQ(2, 10)) |
43 | TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen, | 44 | TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen, |
44 | tcase->cloexec | tcase->nonblock)); | 45 | tcase->cloexec | tcase->nonblock)); |
45 | @@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) | 46 | #else |
46 | TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, | 47 | TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen, |
47 | tcase->cloexec | tcase->nonblock)); | 48 | tcase->cloexec | tcase->nonblock)); |
48 | #endif | 49 | +#endif |
49 | +#else | 50 | +#else |
50 | + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, | 51 | + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, |
51 | + tcase->cloexec | tcase->nonblock)); | 52 | + tcase->cloexec | tcase->nonblock)); |
52 | +#endif | 53 | #endif |
53 | if (TST_RET == -1) { | 54 | if (TST_RET == -1) { |
54 | if (TST_ERR == ENOSYS) | 55 | if (TST_ERR == ENOSYS) |
55 | tst_brk(TCONF, "syscall __NR_accept4 not supported"); | ||
56 | -- | ||
57 | 2.7.4 | ||
58 | |||