summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-22 05:33:52 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-22 05:33:52 +0000
commit94713d1671cddcb1e0c94209e9d783babc73c0e1 (patch)
tree71174e8d49f429283a2ddc34fedb4c969804d05c /libcxx/test
parent88d38802e27244bb6fc074d4e981d3df42be61c1 (diff)
downloadbcm5719-llvm-94713d1671cddcb1e0c94209e9d783babc73c0e1.tar.gz
bcm5719-llvm-94713d1671cddcb1e0c94209e9d783babc73c0e1.zip
Support old GCC exception and rtti detection macros
llvm-svn: 273383
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/support/test_macros.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index f12a76bbdfb..667a243a594 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -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
OpenPOWER on IntegriCloud