From c6f35deb166f15a993de8b64ed42c31c4c5eaeb4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 16 Dec 2015 11:48:55 +0000 Subject: [PATCH] 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: r231679 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/src/c++11/futex.cc | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fb4acc2f4bd4..dad254c20fb9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-12-16 Jonathan Wakely + + PR libstdc++/68921 + * src/c++11/futex.cc + (__atomic_futex_unsigned_base::_M_futex_wait_until): Use null pointer + as timeout argument. + 2015-12-15 Tim Shen Backport from mainline 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; }