summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-07-23 19:43:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:41:38 +0100
commit3ab89fa06f2ef974eee2734ab582f62c98e0020e (patch)
tree9c306beb8d71b12048e245ec337025d0c287d4fa /meta
parentae4ceea4feb5f52d2784707eb30d1f165d2fb9cf (diff)
downloadpoky-3ab89fa06f2ef974eee2734ab582f62c98e0020e.tar.gz
strace: Upgrade to 5.2
License-Updtate: Copyright years changed https://github.com/strace/strace/commit/4b4a0e5a6e74e16dc2bb9b38d81415d9f57425d2#diff-7116ef0705885343c9e1b2171a06be0e Drop backport patch for mips o32 build fix Refresh patches to apply on 5.2 (From OE-Core rev: abeb32772b8b3a144e468e5a27b1a31f646317e4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch13
-rw-r--r--meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch98
-rw-r--r--meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch6
-rw-r--r--meta/recipes-devtools/strace/strace_5.2.bb (renamed from meta/recipes-devtools/strace/strace_4.26.bb)7
4 files changed, 10 insertions, 114 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch b/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
index daafceb37b..fb5f72529f 100644
--- a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
+++ b/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
@@ -13,22 +13,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 ptrace.h | 8 +++++++- 13 ptrace.h | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-) 14 1 file changed, 7 insertions(+), 1 deletion(-)
15 15
16diff --git a/ptrace.h b/ptrace.h
17index 89d4b95..b3f45bb 100644
18--- a/ptrace.h 16--- a/ptrace.h
19+++ b/ptrace.h 17+++ b/ptrace.h
20@@ -30,7 +30,13 @@ 18@@ -30,7 +30,13 @@
21 # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args 19 # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
22 #endif 20 # endif
23 21
24-#include <linux/ptrace.h>
25+#if defined(POWERPC) && !defined(__GLIBC__) 22+#if defined(POWERPC) && !defined(__GLIBC__)
26+#define pt_regs uapi_pt_regs 23+#define pt_regs uapi_pt_regs
27+#endif 24+#endif
28+# include <linux/ptrace.h> 25 # include <linux/ptrace.h>
29+#if defined(POWERPC) && !defined(__GLIBC__) 26+#if defined(POWERPC) && !defined(__GLIBC__)
30+# undef pt_regs 27+# undef pt_regs
31+#endif 28+#endif
32 29
33 #ifdef HAVE_STRUCT_IA64_FPREG 30 # ifdef HAVE_STRUCT_IA64_FPREG
34 # undef ia64_fpreg 31 # undef ia64_fpreg
diff --git a/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch b/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
deleted file mode 100644
index a5dccfb08c..0000000000
--- a/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
+++ /dev/null
@@ -1,98 +0,0 @@
1From 2c8b6de913973274e877639658e9e7273a012adb Mon Sep 17 00:00:00 2001
2From: "Dmitry V. Levin" <ldv@altlinux.org>
3Date: Tue, 8 Jan 2019 19:23:44 +0000
4Subject: [PATCH] mips o32: fix build
5
6Upstream-Status: Backport
7
8Commit 917c2ccf3a67 "Refactor stack pointers" moved mips_REG_* macros
9from linux/mips/arch_regs.h to linux/mips/arch_regs.c because these
10macros are no longer used outside syscall.c or files included by
11syscall.c, but this caused a build regression on mips o32 because
12decode_syscall_subcall() uses mips_REG_SP prior to its definition.
13
14* syscall.c (decode_syscall_subcall): Move ...
15* linux/mips/get_syscall_args.c: ... here.
16
17Reported-by: Baruch Siach <baruch@tkos.co.il>
18Fixes: v4.26~61 "Refactor stack pointers"
19---
20 linux/mips/get_syscall_args.c | 26 ++++++++++++++++++++++++++
21 syscall.c | 27 ++-------------------------
22 2 files changed, 29 insertions(+), 25 deletions(-)
23
24diff --git a/linux/mips/get_syscall_args.c b/linux/mips/get_syscall_args.c
25index 387aa852..e2889f98 100644
26--- a/linux/mips/get_syscall_args.c
27+++ b/linux/mips/get_syscall_args.c
28@@ -37,3 +37,29 @@ arch_get_syscall_args(struct tcb *tcp)
29 #endif
30 return 1;
31 }
32+
33+#ifdef SYS_syscall_subcall
34+static void
35+decode_syscall_subcall(struct tcb *tcp)
36+{
37+ if (!scno_is_valid(tcp->u_arg[0]))
38+ return;
39+ tcp->scno = tcp->u_arg[0];
40+ tcp->qual_flg = qual_flags(tcp->scno);
41+ tcp->s_ent = &sysent[tcp->scno];
42+ memmove(&tcp->u_arg[0], &tcp->u_arg[1],
43+ sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
44+ /*
45+ * Fetching the last arg of 7-arg syscalls (fadvise64_64
46+ * and sync_file_range) requires additional code,
47+ * see linux/mips/get_syscall_args.c
48+ */
49+ if (tcp->s_ent->nargs == MAX_ARGS) {
50+ if (umoven(tcp,
51+ mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
52+ sizeof(tcp->u_arg[0]),
53+ &tcp->u_arg[MAX_ARGS - 1]) < 0)
54+ tcp->u_arg[MAX_ARGS - 1] = 0;
55+ }
56+}
57+#endif /* SYS_syscall_subcall */
58diff --git a/syscall.c b/syscall.c
59index d78f51dd..51fcc721 100644
60--- a/syscall.c
61+++ b/syscall.c
62@@ -349,31 +349,8 @@ decode_ipc_subcall(struct tcb *tcp)
63 #endif /* SYS_ipc_subcall */
64
65 #ifdef SYS_syscall_subcall
66-static void
67-decode_syscall_subcall(struct tcb *tcp)
68-{
69- if (!scno_is_valid(tcp->u_arg[0]))
70- return;
71- tcp->scno = tcp->u_arg[0];
72- tcp->qual_flg = qual_flags(tcp->scno);
73- tcp->s_ent = &sysent[tcp->scno];
74- memmove(&tcp->u_arg[0], &tcp->u_arg[1],
75- sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
76-# ifdef LINUX_MIPSO32
77- /*
78- * Fetching the last arg of 7-arg syscalls (fadvise64_64
79- * and sync_file_range) requires additional code,
80- * see linux/mips/get_syscall_args.c
81- */
82- if (tcp->s_ent->nargs == MAX_ARGS) {
83- if (umoven(tcp,
84- mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
85- sizeof(tcp->u_arg[0]),
86- &tcp->u_arg[MAX_ARGS - 1]) < 0)
87- tcp->u_arg[MAX_ARGS - 1] = 0;
88- }
89-# endif /* LINUX_MIPSO32 */
90-}
91+/* The implementation is architecture specific. */
92+static void decode_syscall_subcall(struct tcb *);
93 #endif /* SYS_syscall_subcall */
94
95 static void
96--
972.17.0
98
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
index becee79d1a..95d85bf34a 100644
--- a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
+++ b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
@@ -19,16 +19,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 tests/sigaction.c | 2 +- 19 tests/sigaction.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
21 21
22diff --git a/tests/sigaction.c b/tests/sigaction.c
23index 95be197..54819f9 100644
24--- a/tests/sigaction.c 22--- a/tests/sigaction.c
25+++ b/tests/sigaction.c 23+++ b/tests/sigaction.c
26@@ -156,7 +156,7 @@ main(void) 24@@ -156,7 +156,7 @@ main(void)
27 sigdelset(mask.libc, SIGHUP); 25 sigdelset(mask.libc, SIGHUP);
28 26
29 memcpy(new_act->mask, mask.old, sizeof(mask.old)); 27 memcpy(new_act->mask, mask.old, sizeof(mask.old));
30-#ifdef SA_RESTORER 28-# ifdef SA_RESTORER
31+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA) 29+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA)
32 new_act->flags = SA_RESTORER; 30 new_act->flags = SA_RESTORER;
33 new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL; 31 new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL;
34 # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx" 32 # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
diff --git a/meta/recipes-devtools/strace/strace_4.26.bb b/meta/recipes-devtools/strace/strace_5.2.bb
index 2688724e66..8367bf1a4f 100644
--- a/meta/recipes-devtools/strace/strace_4.26.bb
+++ b/meta/recipes-devtools/strace/strace_5.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "System call tracing tool"
2HOMEPAGE = "http://strace.io" 2HOMEPAGE = "http://strace.io"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "LGPL-2.1+ & GPL-2+" 4LICENSE = "LGPL-2.1+ & GPL-2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=5c84d1c6e48e7961ccd2cd2ae32f7bf1" 5LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592"
6 6
7SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ 7SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
8 file://disable-git-version-gen.patch \ 8 file://disable-git-version-gen.patch \
@@ -14,11 +14,10 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
14 file://mips-SIGEMT.patch \ 14 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ 16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
17 file://0001-mips-o32-fix-build.patch \
18 file://ptest-spacesave.patch \ 17 file://ptest-spacesave.patch \
19 " 18 "
20SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af" 19SRC_URI[md5sum] = "b9c02b07dcde5125498ce7da69b77baf"
21SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c" 20SRC_URI[sha256sum] = "d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2"
22 21
23inherit autotools ptest 22inherit autotools ptest
24 23