From: Petar Jovanovic <mips32r2@gmail.com>
Date: Tue, 7 Aug 2018 12:09:43 +0000 (+0200)
Subject: mips: add membarrier system call support
X-Git-Tag: VALGRIND_3_14_0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9606bc01cf8a4d40b309b66eb6afff3014a4766;p=thirdparty%2Fvalgrind.git

mips: add membarrier system call support

Fixes none/tests/linux/membarrier on MIPS platforms.
---

diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
index aecffe80d3..c754987fd3 100644
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
@@ -1062,7 +1062,9 @@ static SyscallTableEntry syscall_main_table[] = {
    LINX_ (__NR_process_vm_writev,      sys_process_vm_writev),       // 346
    //..
    LINXY(__NR_getrandom,               sys_getrandom),               // 353
-   LINXY(__NR_memfd_create,            sys_memfd_create)             // 354
+   LINXY(__NR_memfd_create,            sys_memfd_create),            // 354
+   //..
+   LINX_(__NR_membarrier,              sys_membarrier),              // 358
 };
 
 SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno)
diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
index 062fb38044..0b044ee53d 100644
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
@@ -830,6 +830,7 @@ static SyscallTableEntry syscall_main_table[] = {
    LINX_ (__NR_process_vm_writev, sys_process_vm_writev),
    LINXY(__NR_getrandom, sys_getrandom),
    LINXY(__NR_memfd_create, sys_memfd_create),
+   LINX_(__NR_membarrier, sys_membarrier),
    LINX_(__NR_syncfs, sys_syncfs)
 };
 
diff --git a/include/vki/vki-scnums-mips64-linux.h b/include/vki/vki-scnums-mips64-linux.h
index 7481768fdf..3bc08e5da5 100644
--- a/include/vki/vki-scnums-mips64-linux.h
+++ b/include/vki/vki-scnums-mips64-linux.h
@@ -694,6 +694,8 @@
 #define __NR_memfd_create            (__NR_Linux + 318)
 #define __NR_bpf                     (__NR_Linux + 319)
 #define __NR_execveat                (__NR_Linux + 320)
+#define __NR_userfaultfd             (__NR_Linux + 321)
+#define __NR_membarrier              (__NR_Linux + 322)
 
 #else
 #error unknown mips64 abi