diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-06-18 02:12:53 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-06-18 02:12:53 +0000 |
| commit | df93bad1fe0abfa58a9ff4f2f490a39a9b95a315 (patch) | |
| tree | c931a2e871bc706a73a59a78f3c83a4061c90142 | |
| parent | ccc9826f566ddbc1bc977a9e0a2ef218ea485067 (diff) | |
| download | bcm5719-llvm-df93bad1fe0abfa58a9ff4f2f490a39a9b95a315.tar.gz bcm5719-llvm-df93bad1fe0abfa58a9ff4f2f490a39a9b95a315.zip | |
Enable building and using atomic shared_ptr for GCC.
Summary:
Currently the implementation of [util.smartptr.shared.atomic] is provided only when using Clang, and not with GCC. This is a relic of not having a GCC implementation of <atomic>, even though <atomic> isn't actually used in the implementation. This patch enables support for atomic shared_ptr functions when using GCC.
Note that this is not a header only change. Previously only Clang builds of libc++.so would provide the required symbols. There is no reason for this restriction.
After this change both Clang and GCC builds should be binary compatible with each other WRT these symbols.
Reviewers: mclow.lists, rmaprath, EricWF
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D21407
llvm-svn: 273076
| -rw-r--r-- | libcxx/include/memory | 7 | ||||
| -rw-r--r-- | libcxx/src/memory.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 8324d1c5fe0..587d3059ebd 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -5464,9 +5464,8 @@ inline _LIBCPP_INLINE_VISIBILITY basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p); -// TODO(EricWF): Enable this for both Clang and GCC. Currently it is only -// enabled with clang. -#if defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_NO_THREADS) + +#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER) class _LIBCPP_TYPE_VIS __sp_mut { @@ -5595,7 +5594,7 @@ atomic_compare_exchange_weak_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v return atomic_compare_exchange_weak(__p, __v, __w); } -#endif // defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_NO_THREADS) +#endif // !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER) //enum class struct _LIBCPP_TYPE_VIS pointer_safety diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp index 08f2259b8c1..15e947fc0ff 100644 --- a/libcxx/src/memory.cpp +++ b/libcxx/src/memory.cpp @@ -124,7 +124,7 @@ __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT #endif // _LIBCPP_NO_RTTI -#if defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_NO_THREADS) +#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER) static const std::size_t __sp_mut_count = 16; static __libcpp_mutex_t mut_back_imp[__sp_mut_count] = @@ -177,7 +177,7 @@ __get_sp_mut(const void* p) return muts[hash<const void*>()(p) & (__sp_mut_count-1)]; } -#endif // defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_NO_THREADS) +#endif // !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER) void declare_reachable(void*) |
