Make msgrcv wrappers on amd64, arm and mips32 look for IPC_NOWAIT in

the flags argument, not the type argument. Fixes #315534.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13289

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 2f2b0a45090d143f61b7d6b4e7fd0932debc94f7..aaceed8d3edc9ec0a6441a38be207d856a093e1f 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -933,7 +933,7 @@ PRE(sys_msgrcv)
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
                  long, msgytp, int, msgflg);
    ML_(linux_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
-   if ((ARG4 & VKI_IPC_NOWAIT) == 0)
+   if ((ARG5 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
 POST(sys_msgrcv)

diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
index f60d771c2fd1c8c86a2f06868374983e43df8204..42f8fd1df6e4df3e000a00817708feb2154a06f4 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
@@ -606,7 +606,7 @@ PRE(sys_msgrcv)
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
                  long, msgytp, int, msgflg);
    ML_(linux_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
-   if ((ARG4 & VKI_IPC_NOWAIT) == 0)
+   if ((ARG5 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
 POST(sys_msgrcv)

diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
index 47d1cee8a875dcc8fd8b7e60f70c088df5dd0f4b..f21f2acc96b7994b5bb1d7d9e041eb2b2dd79814 100644 (file)
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
@@ -616,7 +616,7 @@ PRE (sys_msgrcv)
   PRE_REG_READ5 (long, "msgrcv", int, msqid, struct msgbuf *, msgp,
                  vki_size_t, msgsz, long, msgytp, int, msgflg);
   ML_ (linux_PRE_sys_msgrcv) (tid, ARG1, ARG2, ARG3, ARG4, ARG5);
-  if ((ARG4 & VKI_IPC_NOWAIT) == 0)
+  if ((ARG5 & VKI_IPC_NOWAIT) == 0)
     *flags |= SfMayBlock;
 }