[Qemu-stable] [PATCH 33/37] linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex

[Michael Roth]

From: John Rigby <address@hidden>

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 <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
(cherry picked from commit cce246e0a21577bb2372ab3a7d6789371e087de9)

Signed-off-by: Michael Roth <address@hidden>
---
 linux-user/syscall.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9e31ea7..7bc5ba9 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:
-- 
1.7.9.5