[libcxx] r181740 - Fixing the MSan/compiler-rt build

David Blaikie dblaikie at gmail.com
Mon May 13 14:53:44 PDT 2013


Author: dblaikie
Date: Mon May 13 16:53:44 2013
New Revision: 181740

URL: http://llvm.org/viewvc/llvm-project?rev=181740&view=rev
Log:
Fixing the MSan/compiler-rt build

Patch by Evgieniy Stepanov, review by İsmail Dönmez.

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=181740&r1=181739&r2=181740&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Mon May 13 16:53:44 2013
@@ -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))





More information about the cfe-commits mailing list