diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-16 10:40:04 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-16 10:40:04 +0000 |
| commit | 934259705a0c8f0a3344cbd112ad703209490cc6 (patch) | |
| tree | 5dd2a48b46cf6ea93adb03ac22b0985e6c64a96a /libstdc++-v3 | |
| parent | 054fd237e4058578d592319d2f0b9063032fed81 (diff) | |
| download | gcc-934259705a0c8f0a3344cbd112ad703209490cc6.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231676 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 298b9dd3833..7fec601ce74 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 e04dba812bf..e723364ced0 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; } |