diff options
| author | John Rigby <john.rigby@linaro.org> | 2013-02-23 16:14:07 -0700 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-03-11 13:04:56 +0200 |
| commit | cce246e0a21577bb2372ab3a7d6789371e087de9 (patch) | |
| tree | ef17a6edbff49c6c5119a9139dd2ec7e45511b49 /linux-user | |
| parent | d95ec14fd20ff69881ab26e7ebd1dab4eb851d97 (diff) | |
| download | qemu-cce246e0a21577bb2372ab3a7d6789371e087de9.zip qemu-cce246e0a21577bb2372ab3a7d6789371e087de9.tar.gz qemu-cce246e0a21577bb2372ab3a7d6789371e087de9.tar.bz2 | |
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>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/syscall.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 19630ea..c7fcfc0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4922,6 +4922,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); @@ -4929,7 +4930,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: |