[libcxx] r273383 - Support old GCC exception and rtti detection macros

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Wed Jun 22 00:33:52 2016
New Revision: 273383

URL: http://llvm.org/viewvc/llvm-project?rev=273383&view=rev
Log:
Support old GCC exception and rtti detection macros

Modified:
    libcxx/trunk/test/support/test_macros.h

Modified: libcxx/trunk/test/support/test_macros.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/test_macros.h?rev=273383&r1=273382&r2=273383&view=diff
==============================================================================
--- libcxx/trunk/test/support/test_macros.h (original)
+++ libcxx/trunk/test/support/test_macros.h Wed Jun 22 00:33:52 2016
@@ -71,11 +71,13 @@
 #define TEST_NOEXCEPT
 #endif
 
-#if !TEST_HAS_FEATURE(cpp_rtti) && !defined(__cpp_rtti)
+#if !TEST_HAS_FEATURE(cpp_rtti) && !defined(__cpp_rtti) \
+    && !defined(__GXX_RTTI)
 #define TEST_HAS_NO_RTTI
 #endif
 
-#if !TEST_HAS_FEATURE(cpp_exceptions) && !defined(__cpp_exceptions)
+#if !TEST_HAS_FEATURE(cpp_exceptions) && !defined(__cpp_exceptions) \
+     && !defined(__EXCEPTIONS)
 #define TEST_HAS_NO_EXCEPTIONS
 #endif