about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@linaro.org>2012-11-21 12:24:11 +0000
committerMarcus Shawcroft <marcus.shawcroft@linaro.org>2012-11-21 12:24:11 +0000
commit86fe56bbdece927de2b0c6f122493e97ad12937a (patch)
tree8698e8e1676875bc01544ca50e53781617a30c7b
parent3bae7c5d987f84cc57b56e1a65e04fbbacdc17ed (diff)
downloadglibc-86fe56bbdece927de2b0c6f122493e97ad12937a.tar.gz
glibc-86fe56bbdece927de2b0c6f122493e97ad12937a.tar.xz
glibc-86fe56bbdece927de2b0c6f122493e97ad12937a.zip
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.
-rw-r--r--ports/ChangeLog.aarch645
-rw-r--r--ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h2
2 files changed, 6 insertions, 1 deletions
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  <marcus.shawcroft@linaro.org>
+
+	* sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
+	(lll_futex_timed_wait_bitset): Remove INTERNAL_SYSCALL_ERROR_P.
+
 2012-11-20  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
 
 	* 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) \