diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-02-05 23:55:51 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-02-05 23:55:51 +0000 |
| commit | be38506d7c74405ca24bd4eb02ddcf2de466dd30 (patch) | |
| tree | 4e0e1dbfc1d92c837f9a097b7f0766a965e6cb0d /libstdc++-v3/include/std | |
| parent | 148ea7d8ef5d9ab40dd9c9a74247b0305200f70c (diff) | |
| download | gcc-be38506d7c74405ca24bd4eb02ddcf2de466dd30.tar.gz | |
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
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/future | 4 |
1 files changed, 4 insertions, 0 deletions
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. |