From be38506d7c74405ca24bd4eb02ddcf2de466dd30 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 5 Feb 2012 23:55:51 +0000 Subject: [PATCH] re PR libstdc++/52104 (go1 fails to run on Solaris 10/11 x86 with with gld) PR libstdc++/52104 * include/std/future (__future_base::_Async_state_common): Define destructor inline for targets without TLS. * src/c++11/future.cc (__future_base::_Async_state_common): Only define destructor for TLS targets. From-SVN: r183920 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/std/future | 4 ++++ libstdc++-v3/src/c++11/future.cc | 2 ++ 3 files changed, 14 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4e9235862cc..799be7c5d4e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2012-02-05 Jonathan Wakely + + PR libstdc++/52104 + * include/std/future (__future_base::_Async_state_common): Define + destructor inline for targets without TLS. + * src/c++11/future.cc (__future_base::_Async_state_common): Only + define destructor for TLS targets. + 2012-02-05 Jonathan Wakely PR libstdc++/51956 diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 1093e3f1bb4..962400bda65 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1425,7 +1425,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class __future_base::_Async_state_common : public __future_base::_State_base { protected: +#ifdef _GLIBCXX_HAVE_TLS ~_Async_state_common(); +#else + ~_Async_state_common() { _M_join(); } +#endif // Allow non-timed waiting functions to block until the thread completes, // as if joined. diff --git a/libstdc++-v3/src/c++11/future.cc b/libstdc++-v3/src/c++11/future.cc index dab0774ad0a..61a9729a133 100644 --- a/libstdc++-v3/src/c++11/future.cc +++ b/libstdc++-v3/src/c++11/future.cc @@ -85,11 +85,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __future_base::_State_base::~_State_base() = default; +#ifdef _GLIBCXX_HAVE_TLS __future_base::_Async_state_common::~_Async_state_common() { _M_join(); } // Explicit instantiation due to -fno-implicit-instantiation. template void call_once(once_flag&, void (thread::*&&)(), reference_wrapper&&); #endif +#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace std -- 2.30.2