From 3d9e6ba593249d9aff82bf48185409e108aeaf0a Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Wed, 3 Sep 2014 14:30:39 +0000 Subject: [PATCH] Allow libc++ to be built with GCC 5.0 compiler Differential Revision: http://reviews.llvm.org/D5169 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217038 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 5907f03123a9b8bc2e31fd671fc5eeae1dd8dc73) Change-Id: I8d9f2496c587b8eda7906e08bf3db218db642f20 --- include/__config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/__config b/include/__config index c018f6b3f..e1c5a67a9 100644 --- a/include/__config +++ b/include/__config @@ -623,8 +623,8 @@ template struct __static_assert_check {}; // 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