arc, metag, nios2, or1k, tile: fix build

Fix build regression introduced by commit
34683e3926d8c2daa368afb805da422ee7043396.

* linux/32/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap.
* linux/arc/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap_pgoff.
* linux/nios2/syscallent.h: Likewise.
* linux/or1k/syscallent.h: Likewise.
* linux/tile/syscallent1.h: Add sys_ prefix to ARCH_mmap and sys_mmap_4koff.
* pathtrace.c (pathtrace_match): Handle SEN_ARCH_mmap.
* NEWS: Mention this build fix.

Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

diff --git a/NEWS b/NEWS
index fe40ca42e14125164eedc6ecd0ce86486569a37d..09263eb22d3cac15316e23f4a8ab6bea24bd916e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 Noteworthy changes in release ?.?? (????-??-??)
 ===============================================
 
+* Bug fixes
+  * Fixed build on arc, metag, nios2, or1k, and tile architectures.
+
 Noteworthy changes in release 4.11 (2015-12-21)
 ===============================================
 

diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h
index 5f997e7207058c3f3536449cc44b58f4c0b51eb3..e6f895c43a6513c641d9c1e3051119f4b6651334 100644 (file)
--- a/linux/32/syscallent.h
+++ b/linux/32/syscallent.h
@@ -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/linux/arc/syscallent.h b/linux/arc/syscallent.h
index 5847dc4883e9a4df9cf929cd52019b0caf4752af..110000834126c9bb3322f14f99dfb3f824b6fc5e 100644 (file)
--- a/linux/arc/syscallent.h
+++ b/linux/arc/syscallent.h
@@ -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/linux/nios2/syscallent.h b/linux/nios2/syscallent.h
index 8a4b70ea62a69834fcb22e50c60d6eae165e5c5f..01efe3a2b0cb9eb0bc80d023fdc9a1a21d570867 100644 (file)
--- a/linux/nios2/syscallent.h
+++ b/linux/nios2/syscallent.h
@@ -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/linux/or1k/syscallent.h b/linux/or1k/syscallent.h
index ed84b3be88c92f83c42a0813c0fcff963381e232..351fe250506d619e464aef24698c102fd3607b8f 100644 (file)
--- a/linux/or1k/syscallent.h
+++ b/linux/or1k/syscallent.h
@@ -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/linux/tile/syscallent1.h b/linux/tile/syscallent1.h
index c86f0597ca5855804ecd54134bbfda94aa0d9a7d..28dbab4d65e2e6ad1e176fff6999670cf69cf406 100644 (file)
--- a/linux/tile/syscallent1.h
+++ b/linux/tile/syscallent1.h
@@ -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/pathtrace.c b/pathtrace.c
index d530ec25619aad07b2e4682576900855ea8818a1..e72cdf7170914ee56792ceda315cc000691e0bc5 100644 (file)
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -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]);