diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-12-16 10:40:04 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-12-16 10:40:04 +0000 |
| commit | 55089c2b5c6f05bc37a19f425ec1612fa6aa8605 (patch) | |
| tree | 5dd2a48b46cf6ea93adb03ac22b0985e6c64a96a | |
| parent | 1408479363d5f34b306c75f60a6dfbdeb5be0544 (diff) | |
| download | gcc-55089c2b5c6f05bc37a19f425ec1612fa6aa8605.zip gcc-55089c2b5c6f05bc37a19f425ec1612fa6aa8605.tar.gz gcc-55089c2b5c6f05bc37a19f425ec1612fa6aa8605.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/futex.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 298b9dd..7fec601 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 e04dba8..e723364 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; } |