From: John Rigby <john.rigby@linaro.org>
Date: Sat, 23 Feb 2013 23:14:07 +0000 (-0700)
Subject: linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex
X-Git-Tag: v1.4.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02493ee4906715e73bb98f6778a19b37924347e0;p=thirdparty%2Fqemu.git

linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex

Upstream libc has recently changed to start using
FUTEX_WAIT_BITSET instead of FUTEX_WAIT and this
is causing do_futex to return -TARGET_ENOSYS.

Pass bitset in val3 to sys_futex which will be
ignored by kernel for the FUTEX_WAIT case.

Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
(cherry picked from commit cce246e0a21577bb2372ab3a7d6789371e087de9)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9e31ea72004..7bc5ba9acff 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4920,6 +4920,7 @@ static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
 #endif
     switch (base_op) {
     case FUTEX_WAIT:
+    case FUTEX_WAIT_BITSET:
         if (timeout) {
             pts = &ts;
             target_to_host_timespec(pts, timeout);
@@ -4927,7 +4928,7 @@ static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
             pts = NULL;
         }
         return get_errno(sys_futex(g2h(uaddr), op, tswap32(val),
-                         pts, NULL, 0));
+                         pts, NULL, val3));
     case FUTEX_WAKE:
         return get_errno(sys_futex(g2h(uaddr), op, val, NULL, NULL, 0));
     case FUTEX_FD: