[libcxx] r217038 - Allow libc++ to be built with GCC 5.0 compiler

Alexey Volkov avolkov.intel at gmail.com
Wed Sep 3 07:30:39 PDT 2014


Author: volkalex
Date: Wed Sep  3 09:30:39 2014
New Revision: 217038

URL: http://llvm.org/viewvc/llvm-project?rev=217038&view=rev
Log:
Allow libc++ to be built with GCC 5.0 compiler

Differential Revision: http://reviews.llvm.org/D5169

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=217038&r1=217037&r2=217038&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Wed Sep  3 09:30:39 2014
@@ -701,8 +701,8 @@ extern "C" void __sanitizer_annotate_con
 // g++ and cl.exe have RTTI on by default and define a macro when it is.
 // g++ only defines the macro in 4.3.2 and onwards.
 #if !defined(_LIBCPP_NO_RTTI)
-#  if defined(__GNUG__) && (__GNUC__ >= 4 && \
-   (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2)) && !defined(__GXX_RTTI)
+#  if defined(__GNUG__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \
+   (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI)
 #    define _LIBCPP_NO_RTTI
 #  elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI)
 #    define _LIBCPP_NO_RTTI





More information about the cfe-commits mailing list