summaryrefslogtreecommitdiffstats
path: root/libcxx/src/support
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2019-03-05 01:57:01 +0000
committerEric Fiselier <eric@efcs.ca>2019-03-05 01:57:01 +0000
commite69290dc7ff7319acf5904f15ab6630fad07ab58 (patch)
tree35b89875fe5bc992c80f093fbaa91547aa06f9af /libcxx/src/support
parent3fd4a968ad80d603ea4dbd616c00824cf165e384 (diff)
downloadbcm5719-llvm-e69290dc7ff7319acf5904f15ab6630fad07ab58.tar.gz
bcm5719-llvm-e69290dc7ff7319acf5904f15ab6630fad07ab58.zip
Make VCRuntime ABI configuration a first-class option.
Summary: On Windows we currently provide two separate ABI configurations. One which defers to `vcruntime` to provide the C++ runtime and another which doesn't. Using `vcruntime` allows interoperability which programs compiled against the MSVC STL, and should be preferred whenever possible. When deferring to `vcruntime` much of the ABI we provide changes. Including the layout of `<stdexcept>` types, their vtables, and how the linkage of their members. This patch introduces the `_LIBCPP_ABI_VCRUNTIME` macro to denote this configuration. It also cleans up the existing configuration for using `vcruntime`. This cleanup lays the groundwork for fixing a number of ABI and interoperability bugs in `<stdexcept>`. Reviewers: thomasanderson, ldionne, smeenai Reviewed By: smeenai Subscribers: jdoerfert, libcxx-commits, #libc Differential Revision: https://reviews.llvm.org/D58942 llvm-svn: 355366
Diffstat (limited to 'libcxx/src/support')
-rw-r--r--libcxx/src/support/runtime/exception_msvc.ipp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/support/runtime/exception_msvc.ipp b/libcxx/src/support/runtime/exception_msvc.ipp
index 21119b0e987..7315b8261b7 100644
--- a/libcxx/src/support/runtime/exception_msvc.ipp
+++ b/libcxx/src/support/runtime/exception_msvc.ipp
@@ -82,7 +82,7 @@ int uncaught_exceptions() _NOEXCEPT {
return __uncaught_exceptions();
}
-#if defined(_LIBCPP_NO_VCRUNTIME)
+#if !defined(_LIBCPP_ABI_VCRUNTIME)
bad_cast::bad_cast() _NOEXCEPT
{
}
@@ -158,6 +158,6 @@ bad_array_new_length::what() const _NOEXCEPT
{
return "bad_array_new_length";
}
-#endif // _LIBCPP_NO_VCRUNTIME
+#endif // !_LIBCPP_ABI_VCRUNTIME
} // namespace std
OpenPOWER on IntegriCloud