diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2015-12-24 15:40:55 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2015-12-24 17:36:58 +0000 |
| commit | dd1a80c8d213eed95fe55b7ebcb07ee165dd8e4b (patch) | |
| tree | 8cfde02d390b1ae7833ac617b625a25547698cb8 | |
| parent | 24fb8efa27a26f75decc684cdfc8fe5189fa6b25 (diff) | |
| download | strace-dd1a80c8d213eed95fe55b7ebcb07ee165dd8e4b.tar.gz | |
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>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | linux/32/syscallent.h | 6 | ||||
| -rw-r--r-- | linux/arc/syscallent.h | 2 | ||||
| -rw-r--r-- | linux/nios2/syscallent.h | 2 | ||||
| -rw-r--r-- | linux/or1k/syscallent.h | 2 | ||||
| -rw-r--r-- | linux/tile/syscallent1.h | 2 | ||||
| -rw-r--r-- | pathtrace.c | 1 |
7 files changed, 11 insertions, 7 deletions
@@ -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 5f997e72..e6f895c4 100644 --- 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 5847dc48..11000083 100644 --- 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 8a4b70ea..01efe3a2 100644 --- 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 ed84b3be..351fe250 100644 --- 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 c86f0597..28dbab4d 100644 --- 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 d530ec25..e72cdf71 100644 --- 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]); |