summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src
diff options
context:
space:
mode:
authorMichael Platings <michael.platings@arm.com>2019-04-25 09:27:50 +0000
committerMichael Platings <michael.platings@arm.com>2019-04-25 09:27:50 +0000
commitd144572dac23c3af6a1ea5efbdffd8813138e216 (patch)
tree8942cf8e17581bc41067d55b8723016ab3989a02 /libcxxabi/src
parent4ea70ecda8802f8472459c6564b6a0769eb1b534 (diff)
downloadbcm5719-llvm-d144572dac23c3af6a1ea5efbdffd8813138e216.tar.gz
bcm5719-llvm-d144572dac23c3af6a1ea5efbdffd8813138e216.zip
Fix compilation error with -DLIBCXXABI_ENABLE_THREADS=OFF
The error is: libcxxabi/src/cxa_guard_impl.h: In instantiation of ‘__cxxabiv1::{anonymous}::LibcppMutex __cxxabiv1::{anonymous}::GlobalStatic<__cxxabiv1::{anonymous}::LibcppMutex>::instance’: libcxxabi/src/cxa_guard_impl.h:529:62: required from here libcxxabi/src/cxa_guard_impl.h:510:23: error: ‘__cxxabiv1::{anonymous}::LibcppMutex __cxxabiv1::{anonymous}::GlobalStatic<__cxxabiv1::{anonymous}::LibcppMutex>::instance’ has incomplete type _LIBCPP_SAFE_STATIC T GlobalStatic<T>::instance = {}; ^ llvm-svn: 359175
Diffstat (limited to 'libcxxabi/src')
-rw-r--r--libcxxabi/src/cxa_guard_impl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h
index ea82d201331..412099e6f4e 100644
--- a/libcxxabi/src/cxa_guard_impl.h
+++ b/libcxxabi/src/cxa_guard_impl.h
@@ -257,6 +257,9 @@ struct LibcppCondVar {
private:
std::__libcpp_condvar_t cond = _LIBCPP_CONDVAR_INITIALIZER;
};
+#else
+struct LibcppMutex {};
+struct LibcppCondVar {};
#endif // !defined(_LIBCXXABI_HAS_NO_THREADS)
OpenPOWER on IntegriCloud