aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxx/memory.cpp
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2013-03-29 16:19:55 +0700
committerBruce Mitchener <bruce.mitchener@gmail.com>2013-03-29 16:19:55 +0700
commitaa0108c75e4177b6db0705ce42998e92c6ac734f (patch)
treec0ec6d57dcb70dfaba808a8c74b8e892d712051b /system/lib/libcxx/memory.cpp
parente3d12277cdbb3c47ddeacf1fa005f2964debefbb (diff)
Update to r178253 from March 29, 2013.
Diffstat (limited to 'system/lib/libcxx/memory.cpp')
-rw-r--r--system/lib/libcxx/memory.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/system/lib/libcxx/memory.cpp b/system/lib/libcxx/memory.cpp
index 14084a52..98bcc864 100644
--- a/system/lib/libcxx/memory.cpp
+++ b/system/lib/libcxx/memory.cpp
@@ -122,7 +122,15 @@ __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT
#if __has_feature(cxx_atomic)
static const std::size_t __sp_mut_count = 16;
-static mutex mut_back[__sp_mut_count];
+static pthread_mutex_t mut_back_imp[__sp_mut_count] =
+{
+ PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+ PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+ PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+ PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER
+};
+
+static mutex* mut_back = reinterpret_cast<std::mutex*>(mut_back_imp);
_LIBCPP_CONSTEXPR __sp_mut::__sp_mut(void* p) _NOEXCEPT
: __lx(p)