libgomp: Fix default futex vs errno

	* config/linux/futex.h (futex_wait): Get error value from errno.
	(futex_wake): Likewise.

From-SVN: r209037

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index bc33ea9a37b59ae626e00bd0daeb70de6cf6473a..8d3bc356eff905e2c274dea7f9c4bba3a57fa128 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-02  Richard Henderson  <rth@redhat.com>
+
+       * config/linux/futex.h (futex_wait): Get error value from errno.
+       (futex_wake): Likewise.
+
 2013-04-11  Release Manager
 
        * GCC 4.7.3 released.

diff --git a/libgomp/config/linux/futex.h b/libgomp/config/linux/futex.h
index d0136f50ac2ee5e5c51686a868bea5c3d521a801..b1ce2afadd433223ed9fe45a310944d77d3c092b 100644 (file)
--- a/libgomp/config/linux/futex.h
+++ b/libgomp/config/linux/futex.h
@@ -41,8 +41,8 @@
 static inline void
 futex_wait (int *addr, int val)
 {
-  long err = syscall (SYS_futex, addr, gomp_futex_wait, val, NULL);
-  if (__builtin_expect (err == -ENOSYS, 0))
+  int err = syscall (SYS_futex, addr, gomp_futex_wait, val, NULL);
+  if (__builtin_expect (err < 0 && errno == ENOSYS, 0))
     {
       gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
       gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
@@ -53,8 +53,8 @@ futex_wait (int *addr, int val)
 static inline void
 futex_wake (int *addr, int count)
 {
-  long err = syscall (SYS_futex, addr, gomp_futex_wake, count);
-  if (__builtin_expect (err == -ENOSYS, 0))
+  int err = syscall (SYS_futex, addr, gomp_futex_wake, count);
+  if (__builtin_expect (err < 0 && errno == ENOSYS, 0))
     {
       gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
       gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;