fix ARC compile, hotfix from upstream

7 files changed, 60 insertions, 1 deletions

diff --git a/package/strace/Makefile b/package/strace/Makefile
index c53d2bb7d..f8437e98c 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
 PKG_VERSION:=		4.11
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_HASH:=		e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152
 PKG_DESCR:=		system call trace program
 PKG_SECTION:=		app/debug
diff --git a/package/strace/patches/patch-linux_32_syscallent_h b/package/strace/patches/patch-linux_32_syscallent_h
new file mode 100644
index 000000000..9d3c98a19
--- /dev/null
+++ b/package/strace/patches/patch-linux_32_syscallent_h
@@ -0,0 +1,17 @@
+--- strace-4.11.orig/linux/32/syscallent.h	2015-12-05 00:12:14.000000000 +0100
++++ strace-4.11/linux/32/syscallent.h	2015-12-25 15:36:04.814035892 +0100
+@@ -1,5 +1,5 @@
+-#ifndef ARCH_mmap
+-# define ARCH_mmap mmap
++#ifndef sys_ARCH_mmap
++# define sys_ARCH_mmap sys_mmap
+ #endif
+ [  0] = { 2,	0,		SEN(io_setup),			"io_setup"		},
+ [  1] = { 1,	0,		SEN(io_destroy),		"io_destroy"		},
+@@ -276,5 +276,5 @@
+ [283] = { 2,	0,		SEN(membarrier),		"membarrier",		},
+ [284] = { 3,	TM,		SEN(mlock2),			"mlock2"		},
+ 
+-#undef ARCH_mmap
++#undef sys_ARCH_mmap
+ #undef ARCH_WANT_SYNC_FILE_RANGE2
diff --git a/package/strace/patches/patch-linux_arc_syscallent_h b/package/strace/patches/patch-linux_arc_syscallent_h
new file mode 100644
index 000000000..c58ed81f8
--- /dev/null
+++ b/package/strace/patches/patch-linux_arc_syscallent_h
@@ -0,0 +1,8 @@
+--- strace-4.11.orig/linux/arc/syscallent.h	2015-07-13 00:31:40.000000000 +0200
++++ strace-4.11/linux/arc/syscallent.h	2015-12-25 15:36:04.814035892 +0100
+@@ -1,4 +1,4 @@
+-#define ARCH_mmap mmap_pgoff
++#define sys_ARCH_mmap sys_mmap_pgoff
+ #include "32/syscallent.h"
+ [244] = { 3,	0,	SEN(printargs),	"arc_cacheflush"},
+ [245] = { 1,	0,	SEN(printargs),	"arc_settls"	},
diff --git a/package/strace/patches/patch-linux_nios2_syscallent_h b/package/strace/patches/patch-linux_nios2_syscallent_h
new file mode 100644
index 000000000..ad1f80f04
--- /dev/null
+++ b/package/strace/patches/patch-linux_nios2_syscallent_h
@@ -0,0 +1,8 @@
+--- strace-4.11.orig/linux/nios2/syscallent.h	2015-07-13 00:31:40.000000000 +0200
++++ strace-4.11/linux/nios2/syscallent.h	2015-12-25 15:36:04.814035892 +0100
+@@ -1,4 +1,4 @@
+-#define ARCH_mmap mmap_pgoff
++#define sys_ARCH_mmap sys_mmap_pgoff
+ #include "32/syscallent.h"
+ [244] = {4,    0,	SEN(cacheflush), "cacheflush"},
+ [245 ... 259] = { },
diff --git a/package/strace/patches/patch-linux_or1k_syscallent_h b/package/strace/patches/patch-linux_or1k_syscallent_h
new file mode 100644
index 000000000..d39ad9643
--- /dev/null
+++ b/package/strace/patches/patch-linux_or1k_syscallent_h
@@ -0,0 +1,8 @@
+--- strace-4.11.orig/linux/or1k/syscallent.h	2015-07-13 00:31:40.000000000 +0200
++++ strace-4.11/linux/or1k/syscallent.h	2015-12-25 15:36:04.814035892 +0100
+@@ -1,4 +1,4 @@
+-#define ARCH_mmap mmap_pgoff
++#define sys_ARCH_mmap sys_mmap_pgoff
+ #include "32/syscallent.h"
+ [244] = { 3,	NF,	SEN(or1k_atomic),	"or1k_atomic"	},
+ [245 ... 259] = { },
diff --git a/package/strace/patches/patch-linux_tile_syscallent1_h b/package/strace/patches/patch-linux_tile_syscallent1_h
new file mode 100644
index 000000000..79dfd0229
--- /dev/null
+++ b/package/strace/patches/patch-linux_tile_syscallent1_h
@@ -0,0 +1,8 @@
+--- strace-4.11.orig/linux/tile/syscallent1.h	2015-07-13 00:31:40.000000000 +0200
++++ strace-4.11/linux/tile/syscallent1.h	2015-12-25 15:36:04.814035892 +0100
+@@ -1,4 +1,4 @@
+-#define ARCH_mmap mmap_4koff
++#define sys_ARCH_mmap sys_mmap_4koff
+ #define ARCH_WANT_SYNC_FILE_RANGE2 1
+ #include "32/syscallent.h"
+ [244] = { 1,	0,	SEN(printargs),	"cmpxchg_badaddr"	},
diff --git a/package/strace/patches/patch-pathtrace_c b/package/strace/patches/patch-pathtrace_c
new file mode 100644
index 000000000..cbe0ac27d
--- /dev/null
+++ b/package/strace/patches/patch-pathtrace_c
@@ -0,0 +1,10 @@
+--- strace-4.11.orig/pathtrace.c	2015-11-23 00:21:35.000000000 +0100
++++ strace-4.11/pathtrace.c	2015-12-25 15:36:04.814035892 +0100
+@@ -216,6 +216,7 @@ pathtrace_match(struct tcb *tcp)
+ 	case SEN_mmap:
+ 	case SEN_mmap_4koff:
+ 	case SEN_mmap_pgoff:
++	case SEN_ARCH_mmap:
+ 		/* x, x, x, x, fd */
+ 		return fdmatch(tcp, tcp->u_arg[4]);
+