git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2015-01-17 13:48:48 +00:00 committed by Jonathan Wakely
parent adbfb3f8e0
commit c6c1bfd99b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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> 2015-01-17 Ville Voutilainen <ville.voutilainen@gmail.com>
Jonathan Wakely <jwakely@redhat.com> Jonathan Wakely <jwakely@redhat.com>

6
libstdc++-v3/include/bits/atomic_futex.h
View File

@ -48,6 +48,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) #if defined(_GLIBCXX_HAVE_LINUX_FUTEX)
struct __atomic_futex_unsigned_base 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. // If futexes are not available, use a mutex and a condvar to wait.
// Because we access the data only within critical sections, all accesses // 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 _GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std