summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
deleted file mode 100644
index dd0617a15f..0000000000
--- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Dec 2019 10:18:38 -0800
4Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info
5
6glibc 2.31+ has defined __ptrace_syscall_info [1]
7
8[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 get_personality.h | 2 ++
14 ptrace.h | 2 ++
15 2 files changed, 4 insertions(+)
16
17--- a/get_personality.h
18+++ b/get_personality.h
19@@ -10,7 +10,9 @@
20
21 # include "ptrace.h"
22
23+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
24 extern int
25 get_personality_from_syscall_info(const struct ptrace_syscall_info *);
26+# endif
27
28 #endif /* !STRACE_GET_PERSONALITY_H */
29--- a/ptrace.h
30+++ b/ptrace.h
31@@ -186,6 +186,9 @@ struct ptrace_syscall_info {
32 };
33 # endif
34
35+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
36+# define ptrace_syscall_info __ptrace_syscall_info
37+# endif
38 # if !HAVE_DECL_PTRACE_PEEKUSER
39 # define PTRACE_PEEKUSER PTRACE_PEEKUSR
40 # endif
41--- a/configure.ac
42+++ b/configure.ac
43@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n
44 AC_CHECK_TYPES(m4_normalize([
45 struct pt_all_user_regs,
46 struct ia64_fpreg,
47- struct ptrace_peeksiginfo_args
48+ struct ptrace_peeksiginfo_args,
49+ struct __ptrace_syscall_info
50 ]),,, [#include <sys/ptrace.h>])
51
52 # For kernels that do not have v3.10-rc1~201^2~11