From 7cc51d643eb0b504396f77155d80eda2b081819c Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 26 Mar 2014 22:52:16 +0100
Subject: [PATCH] futex_bits.h: Include errno.h.

	* config/linux/futex_bits.h: Include errno.h.
	(sys_futex0): If syscall returns -1, return -errno rather than
	-1.

From-SVN: r208855
---
 libitm/ChangeLog                 | 6 ++++++
 libitm/config/linux/futex_bits.h | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 00db949bad91..1ce194ec9341 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/linux/futex_bits.h: Include errno.h.
+	(sys_futex0): If syscall returns -1, return -errno rather than
+	-1.
+
 2014-03-26  Joseph Myers  <joseph@codesourcery.com>
 
 	* libitm.texi (Index): Rename to Library Index.
diff --git a/libitm/config/linux/futex_bits.h b/libitm/config/linux/futex_bits.h
index 62d83d185570..dc1eb1fa301d 100644
--- a/libitm/config/linux/futex_bits.h
+++ b/libitm/config/linux/futex_bits.h
@@ -31,9 +31,13 @@
 
 #include <unistd.h>
 #include <sys/syscall.h>
+#include <errno.h>
 
 static inline long
 sys_futex0 (std::atomic<int> *addr, long op, long val)
 {
-  return syscall (SYS_futex, (int*) addr, op, val, 0);
+  long res = syscall (SYS_futex, (int*) addr, op, val, 0);
+  if (__builtin_expect (res == -1, 0))
+    return -errno;
+  return res;
 }
-- 
2.43.5