diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-17 13:48:48 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-17 13:48:48 +0000 |
| commit | c6c1bfd99bbe6789b88f59c90c753206ca1cd3fd (patch) | |
| tree | d65d8a1adf76b9cb9573ee4b3c52bc23d45c6545 | |
| parent | adbfb3f8e04049409f9adcbc746fe43cc25f8a45 (diff) | |
| download | gcc-c6c1bfd99bbe6789b88f59c90c753206ca1cd3fd.zip gcc-c6c1bfd99bbe6789b88f59c90c753206ca1cd3fd.tar.gz gcc-c6c1bfd99bbe6789b88f59c90c753206ca1cd3fd.tar.bz2 | |
re PR libstdc++/64638 (Build failure with recent futex changes in libstdc++, likely all non-gthreads targets)
PR libstdc++/64638
* include/bits/atomic_futex.h: Use appropriate config macros for
availability of std::mutex, std::condition and std::chrono.
From-SVN: r219799
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_futex.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 63aa21b..e0bfa81 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-01-17 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/64638 + * include/bits/atomic_futex.h: Use appropriate config macros for + availability of std::mutex, std::condition and std::chrono. + 2015-01-17 Ville Voutilainen <ville.voutilainen@gmail.com> Jonathan Wakely <jwakely@redhat.com> diff --git a/libstdc++-v3/include/bits/atomic_futex.h b/libstdc++-v3/include/bits/atomic_futex.h index 9a418d8..2673604 100644 --- a/libstdc++-v3/include/bits/atomic_futex.h +++ b/libstdc++-v3/include/bits/atomic_futex.h @@ -48,6 +48,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) #if defined(_GLIBCXX_HAVE_LINUX_FUTEX) struct __atomic_futex_unsigned_base { @@ -209,7 +210,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; -#else +#else // !_GLIBCXX_HAVE_LINUX_FUTEX // If futexes are not available, use a mutex and a condvar to wait. // Because we access the data only within critical sections, all accesses @@ -280,7 +281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; -#endif +#endif // _GLIBCXX_HAVE_LINUX_FUTEX +#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 _GLIBCXX_END_NAMESPACE_VERSION } // namespace std |