From: Julian Seward <jseward@acm.org>
Date: Tue, 15 Mar 2005 01:38:57 +0000 (+0000)
Subject: Fix another merge-related problem.  I think this may resolve the
X-Git-Tag: svn/VALGRIND_3_0_0~958
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97fbbe4bf2d8def800f84921493da147dd6ee0a1;p=thirdparty%2Fvalgrind.git

Fix another merge-related problem.  I think this may resolve the
thread-hang-at-exit issues.



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

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index d8a7426b9a..54505bbe28 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -4990,7 +4990,6 @@ POST(sys_waitpid)
 PRE(sys_wait4, MayBlock)
 {
    PRINT("sys_wait4 ( %d, %p, %d, %p )", ARG1,ARG2,ARG3,ARG4);
-   ARG3 &= ~(__VKI_WCLONE | __VKI_WALL);
 
    PRE_REG_READ4(long, "wait4", 
                  vki_pid_t, pid, unsigned int *, status, int, options,