From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 16 Dec 2015 10:40:04 +0000 (+0000)
Subject: libstdc++/68921 add timeout argument to futex(2)
X-Git-Tag: basepoints/gcc-7~2076
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55089c2b5c6f05bc37a19f425ec1612fa6aa8605;p=thirdparty%2Fgcc.git

libstdc++/68921 add timeout argument to futex(2)

	PR libstdc++/68921
	* src/c++11/futex.cc
	(__atomic_futex_unsigned_base::_M_futex_wait_until): Use null pointer
	as timeout argument.

From-SVN: r231676
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 298b9dd3833c..7fec601ce741 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2015-12-15  Jonathan Wakely  <jwakely@redhat.com>
 
+	PR libstdc++/68921
+	* src/c++11/futex.cc
+	(__atomic_futex_unsigned_base::_M_futex_wait_until): Use null pointer
+	as timeout argument.
+
 	* include/std/functional (_Mu<_Arg, false, false>::operator()): Restore
 	accidentally-removed volatile qualifier.
 
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
index e04dba812bf0..e723364ced08 100644
--- a/libstdc++-v3/src/c++11/futex.cc
+++ b/libstdc++-v3/src/c++11/futex.cc
@@ -52,7 +52,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	// we will fall back to spin-waiting.  The only thing we could do
 	// here on errors is abort.
 	int ret __attribute__((unused));
-	ret = syscall (SYS_futex, __addr, futex_wait_op, __val);
+	ret = syscall (SYS_futex, __addr, futex_wait_op, __val, nullptr);
 	_GLIBCXX_DEBUG_ASSERT(ret == 0 || errno == EINTR || errno == EAGAIN);
 	return true;
       }