From: Petar Jovanovic <mips32r2@gmail.com>
Date: Mon, 22 Jul 2019 17:56:33 +0000 (+0200)
Subject: mips: hook up preadv, preadv2, pwritev and pwritev2 correctly
X-Git-Tag: VALGRIND_3_16_0~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd2a81f202a008abd669bd4b7b5cf30f271f5724;p=thirdparty%2Fvalgrind.git

mips: hook up preadv, preadv2, pwritev and pwritev2 correctly

Use the correct generic linux sys wrapper.

Follow-up for

  commit b0861063a8d2a55bb7423e90d26806bab0f78a12
  Author: Alexandra Hajkova <ahajkova@redhat.com>
  Date:   Tue Jun 4 13:47:14 2019 +0200

    Add support for preadv2 and pwritev2 syscalls

This should fix
memcheck/tests/linux/sys-preadv2_pwritev2 (stderr)
memcheck/tests/linux/sys-preadv_pwritev  (stderr)

on mips32/mips64.
---

diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
index 244f385a24..11eb6c117a 100644
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
@@ -1050,6 +1050,8 @@ static SyscallTableEntry syscall_main_table[] = {
    //..
    LINXY (__NR_pipe2,                  sys_pipe2),                   // 328
    LINXY (__NR_inotify_init1,          sys_inotify_init1),           // 329
+   LINXY (__NR_preadv,                 sys_preadv),                  // 330
+   LINX_ (__NR_pwritev,                sys_pwritev),                 // 331
    //..
    LINXY (__NR_prlimit64,              sys_prlimit64),               // 338
    //..
@@ -1059,12 +1061,14 @@ static SyscallTableEntry syscall_main_table[] = {
    LINXY (__NR_process_vm_readv,       sys_process_vm_readv),        // 345
    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_getrandom,              sys_getrandom),               // 353
+   LINXY (__NR_memfd_create,           sys_memfd_create),            // 354
    //..
-   LINX_(__NR_membarrier,              sys_membarrier),              // 358
+   LINX_ (__NR_membarrier,             sys_membarrier),              // 358
    //..
-   LINX_(__NR_copy_file_range,         sys_copy_file_range),         // 360
+   LINX_ (__NR_copy_file_range,        sys_copy_file_range),         // 360
+   LINXY (__NR_preadv2,                sys_preadv2),                 // 361
+   LINX_ (__NR_pwritev2,               sys_pwritev2),                // 362
    //..
    LINXY(__NR_statx,                   sys_statx)                    // 366
 };
diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
index 1ab82444c9..9b5c07f15c 100644
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
@@ -826,14 +826,16 @@ static SyscallTableEntry syscall_main_table[] = {
    LINXY (__NR_clock_adjtime, sys_clock_adjtime),
    LINXY (__NR_process_vm_readv, sys_process_vm_readv),
    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_copy_file_range, sys_copy_file_range),
-   LINX_(__NR_preadv2, sys_preadv2),
-   LINX_(__NR_pwritev2, sys_pwritev2),
-   LINX_(__NR_syncfs, sys_syncfs),
-   LINXY(__NR_statx, sys_statx),
+   LINXY (__NR_getrandom, sys_getrandom),
+   LINXY (__NR_memfd_create, sys_memfd_create),
+   LINX_ (__NR_membarrier, sys_membarrier),
+   LINX_ (__NR_copy_file_range, sys_copy_file_range),
+   LINXY (__NR_preadv, sys_preadv),
+   LINX_ (__NR_pwritev, sys_pwritev),
+   LINXY (__NR_preadv2, sys_preadv2),
+   LINX_ (__NR_pwritev2, sys_pwritev2),
+   LINX_ (__NR_syncfs, sys_syncfs),
+   LINXY (__NR_statx, sys_statx),
 };
 
 SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno )