From 86fe56bbdece927de2b0c6f122493e97ad12937a Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Wed, 21 Nov 2012 12:24:11 +0000 Subject: [PATCH] aarch64: Fix lll_futex_timed_wait_bitset return value sign. The implementation of lll_futex_timed_wait_bitset should not be negating the futex syscall return value on error. --- ports/ChangeLog.aarch64 | 5 +++++ ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 7088c23d95..2caca320af 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,8 @@ +2012-11-21 Marcus Shawcroft + + * sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h + (lll_futex_timed_wait_bitset): Remove INTERNAL_SYSCALL_ERROR_P. + 2012-11-20 Marcus Shawcroft * sysdeps/aarch64/fpu/s_fma.c (weak_alias_x): diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h index e4f0c9427b..705cffd353 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h @@ -96,7 +96,7 @@ __lll_private_flag (__op, private), \ (val), (timespec), NULL /* Unused. */, \ FUTEX_BITSET_MATCH_ANY); \ - INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \ + __ret; \ }) #define lll_futex_wake(futexp, nr, private) \