diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-02-12 09:54:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-14 11:42:19 +0000 |
commit | b5b8003a0b99fb591f2e2a0a5ed74e60a120dc87 (patch) | |
tree | dc2c9b361a74923b39f75c5b1dc0f845a335051d /meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch | |
parent | f6b39575fb4cbc7cd9f7fbe57562ebca8901d59d (diff) | |
download | poky-b5b8003a0b99fb591f2e2a0a5ed74e60a120dc87.tar.gz |
ltp: Upgrade to 20160126 and fix build on musl
pass -D__SANE_USERSPACE_TYPES__ to CFLAGS
MIPS64/PPC64 uses long long for u64 in the kernel, but powerpc's asm/types.h
prevents 64-bit userland from seeing this definition, instead
defaulting to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__
to get int-ll64.h included.
(From OE-Core rev: d17984eda9635f98d4472019d4af83f661b4dfe7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch b/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch new file mode 100644 index 0000000000..4680c03d4e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 560347f77236616a635b4a997a0596b8da4d0799 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 8 Jan 2016 07:08:25 +0000 | ||
4 | Subject: [PATCH 23/32] ptrace: Use int instead of enum __ptrace_request | ||
5 | |||
6 | __ptrace_request is only available with glibc | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | testcases/kernel/syscalls/ptrace/ptrace03.c | 4 ++++ | ||
11 | testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h | 4 ++++ | ||
12 | 2 files changed, 8 insertions(+) | ||
13 | |||
14 | diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c | ||
15 | index a4028fc..f1880cd 100644 | ||
16 | --- a/testcases/kernel/syscalls/ptrace/ptrace03.c | ||
17 | +++ b/testcases/kernel/syscalls/ptrace/ptrace03.c | ||
18 | @@ -102,7 +102,11 @@ static pid_t unused_pid; | ||
19 | static pid_t zero_pid; | ||
20 | |||
21 | struct test_case_t { | ||
22 | +#ifdef __GLIBC__ | ||
23 | enum __ptrace_request request; | ||
24 | +#else | ||
25 | + int request; | ||
26 | +#endif | ||
27 | pid_t *pid; | ||
28 | int exp_errno; | ||
29 | } test_cases[] = { | ||
30 | diff --git a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h | ||
31 | index ae538e9..85aa89d 100644 | ||
32 | --- a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h | ||
33 | +++ b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h | ||
34 | @@ -130,7 +130,11 @@ static char *strings[] = { | ||
35 | SPT(KILL) | ||
36 | SPT(SINGLESTEP) | ||
37 | }; | ||
38 | +#ifdef __GLIBC__ | ||
39 | static inline char *strptrace(enum __ptrace_request request) | ||
40 | +#else | ||
41 | +static inline char *strptrace(int request) | ||
42 | +#endif | ||
43 | { | ||
44 | return strings[request]; | ||
45 | } | ||
46 | -- | ||
47 | 2.7.0 | ||
48 | |||