summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch117
-rw-r--r--meta/recipes-devtools/strace/strace_4.11.bb1
2 files changed, 118 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch b/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
new file mode 100644
index 0000000000..a9d32037b0
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
@@ -0,0 +1,117 @@
1From dd1a80c8d213eed95fe55b7ebcb07ee165dd8e4b Mon Sep 17 00:00:00 2001
2From: "Dmitry V. Levin" <ldv@altlinux.org>
3Date: Thu, 24 Dec 2015 15:40:55 +0000
4Subject: [PATCH] arc, metag, nios2, or1k, tile: fix build
5
6Fix build regression introduced by commit
734683e3926d8c2daa368afb805da422ee7043396.
8
9* linux/32/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap.
10* linux/arc/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap_pgoff.
11* linux/nios2/syscallent.h: Likewise.
12* linux/or1k/syscallent.h: Likewise.
13* linux/tile/syscallent1.h: Add sys_ prefix to ARCH_mmap and sys_mmap_4koff.
14* pathtrace.c (pathtrace_match): Handle SEN_ARCH_mmap.
15* NEWS: Mention this build fix.
16
17Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
18Signed-off-by: Marek Vasut <marex@denx.de>
19Upstream-Status: Backport
20---
21 NEWS | 3 +++
22 linux/32/syscallent.h | 6 +++---
23 linux/arc/syscallent.h | 2 +-
24 linux/nios2/syscallent.h | 2 +-
25 linux/or1k/syscallent.h | 2 +-
26 linux/tile/syscallent1.h | 2 +-
27 pathtrace.c | 1 +
28 7 files changed, 11 insertions(+), 7 deletions(-)
29
30diff --git a/NEWS b/NEWS
31index fe40ca4..09263eb 100644
32--- a/NEWS
33+++ b/NEWS
34@@ -1,3 +1,9 @@
35+Noteworthy changes in release ?.?? (????-??-??)
36+===============================================
37+
38+* Bug fixes
39+ * Fixed build on arc, metag, nios2, or1k, and tile architectures.
40+
41 Noteworthy changes in release 4.11 (2015-12-21)
42 ===============================================
43
44diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h
45index 5f997e7..e6f895c 100644
46--- a/linux/32/syscallent.h
47+++ b/linux/32/syscallent.h
48@@ -1,5 +1,5 @@
49-#ifndef ARCH_mmap
50-# define ARCH_mmap mmap
51+#ifndef sys_ARCH_mmap
52+# define sys_ARCH_mmap sys_mmap
53 #endif
54 [ 0] = { 2, 0, SEN(io_setup), "io_setup" },
55 [ 1] = { 1, 0, SEN(io_destroy), "io_destroy" },
56@@ -276,5 +276,5 @@
57 [283] = { 2, 0, SEN(membarrier), "membarrier", },
58 [284] = { 3, TM, SEN(mlock2), "mlock2" },
59
60-#undef ARCH_mmap
61+#undef sys_ARCH_mmap
62 #undef ARCH_WANT_SYNC_FILE_RANGE2
63diff --git a/linux/arc/syscallent.h b/linux/arc/syscallent.h
64index 5847dc4..1100008 100644
65--- a/linux/arc/syscallent.h
66+++ b/linux/arc/syscallent.h
67@@ -1,4 +1,4 @@
68-#define ARCH_mmap mmap_pgoff
69+#define sys_ARCH_mmap sys_mmap_pgoff
70 #include "32/syscallent.h"
71 [244] = { 3, 0, SEN(printargs), "arc_cacheflush"},
72 [245] = { 1, 0, SEN(printargs), "arc_settls" },
73diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h
74index 8a4b70e..01efe3a 100644
75--- a/linux/nios2/syscallent.h
76+++ b/linux/nios2/syscallent.h
77@@ -1,4 +1,4 @@
78-#define ARCH_mmap mmap_pgoff
79+#define sys_ARCH_mmap sys_mmap_pgoff
80 #include "32/syscallent.h"
81 [244] = {4, 0, SEN(cacheflush), "cacheflush"},
82 [245 ... 259] = { },
83diff --git a/linux/or1k/syscallent.h b/linux/or1k/syscallent.h
84index ed84b3b..351fe25 100644
85--- a/linux/or1k/syscallent.h
86+++ b/linux/or1k/syscallent.h
87@@ -1,4 +1,4 @@
88-#define ARCH_mmap mmap_pgoff
89+#define sys_ARCH_mmap sys_mmap_pgoff
90 #include "32/syscallent.h"
91 [244] = { 3, NF, SEN(or1k_atomic), "or1k_atomic" },
92 [245 ... 259] = { },
93diff --git a/linux/tile/syscallent1.h b/linux/tile/syscallent1.h
94index c86f059..28dbab4 100644
95--- a/linux/tile/syscallent1.h
96+++ b/linux/tile/syscallent1.h
97@@ -1,4 +1,4 @@
98-#define ARCH_mmap mmap_4koff
99+#define sys_ARCH_mmap sys_mmap_4koff
100 #define ARCH_WANT_SYNC_FILE_RANGE2 1
101 #include "32/syscallent.h"
102 [244] = { 1, 0, SEN(printargs), "cmpxchg_badaddr" },
103diff --git a/pathtrace.c b/pathtrace.c
104index d530ec2..e72cdf7 100644
105--- a/pathtrace.c
106+++ b/pathtrace.c
107@@ -216,6 +216,7 @@ pathtrace_match(struct tcb *tcp)
108 case SEN_mmap:
109 case SEN_mmap_4koff:
110 case SEN_mmap_pgoff:
111+ case SEN_ARCH_mmap:
112 /* x, x, x, x, fd */
113 return fdmatch(tcp, tcp->u_arg[4]);
114
115--
1162.6.4
117
diff --git a/meta/recipes-devtools/strace/strace_4.11.bb b/meta/recipes-devtools/strace/strace_4.11.bb
index 95d13e6bb9..3e542ca049 100644
--- a/meta/recipes-devtools/strace/strace_4.11.bb
+++ b/meta/recipes-devtools/strace/strace_4.11.bb
@@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
9 file://more-robust-test-for-m32-mx32-compile-support.patch \ 9 file://more-robust-test-for-m32-mx32-compile-support.patch \
10 file://update-gawk-paths.patch \ 10 file://update-gawk-paths.patch \
11 file://use-asm-sgidefs.h.patch \ 11 file://use-asm-sgidefs.h.patch \
12 file://0001-arc-metag-nios2-or1k-tile-fix-build.patch \
12 file://Makefile-ptest.patch \ 13 file://Makefile-ptest.patch \
13 file://run-ptest \ 14 file://run-ptest \
14 " 15 "