summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2013-05-13 21:53:44 +0000
committerDavid Blaikie <dblaikie@gmail.com>2013-05-13 21:53:44 +0000
commitf13dbe4799d85535a23bd613c38d3815997b43ec (patch)
tree7fa586dafedfd3afd36e3d8da109990a59779182
parentca9409dd558b7f8fe541a801da1130644d35b367 (diff)
downloadbcm5719-llvm-f13dbe4799d85535a23bd613c38d3815997b43ec.tar.gz
bcm5719-llvm-f13dbe4799d85535a23bd613c38d3815997b43ec.zip
Fixing the MSan/compiler-rt build
Patch by Evgieniy Stepanov, review by İsmail Dönmez. llvm-svn: 181740
-rw-r--r--libcxx/include/__config12
1 files changed, 11 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 6b8475b7e31..d5c39858ae3 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -278,9 +278,19 @@ typedef __char32_t char32_t;
#define _LIBCPP_HAS_NO_CONSTEXPR
#endif
-#if ( defined(__FreeBSD__) || defined(__linux__) ) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
+#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
+#if defined(__FreeBSD__)
#define _LIBCPP_HAS_QUICK_EXIT
#define _LIBCPP_HAS_C11_FEATURES
+#elif defined(__linux__)
+#include <features.h>
+#if __GLIBC_PREREQ(2, 15)
+#define _LIBCPP_HAS_QUICK_EXIT
+#endif
+#if __GLIBC_PREREQ(2, 17)
+#define _LIBCPP_HAS_C11_FEATURES
+#endif
+#endif
#endif
#if (__has_feature(cxx_noexcept))
OpenPOWER on IntegriCloud