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
This commit is contained in:
Tom Hughes 2013-02-21 10:57:23 +00:00
parent 23923e4d3d
commit 0d1fe31512
3 changed files with 3 additions and 3 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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;
}