diff options
| author | Reid Kleckner <rnk@google.com> | 2016-02-01 19:13:28 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-02-01 19:13:28 +0000 |
| commit | b3e847ebac268d7a802c117f5f7e2b2a80c9a07f (patch) | |
| tree | 94c79e9d8a0872712cbd090d2ecc3bc4e4ee8246 | |
| parent | 92431703d7a2a84b224a70608ce295fd4eed4791 (diff) | |
| download | bcm5719-llvm-b3e847ebac268d7a802c117f5f7e2b2a80c9a07f.tar.gz bcm5719-llvm-b3e847ebac268d7a802c117f5f7e2b2a80c9a07f.zip | |
[ubsan] Stop thinking we can rely on C++ ABI knowledge on Windows
We already disabled various tests relying on C++ ABI knowledge, but we
still tried to build in this configuration on Windows which was a
mistake.
Fixes PR26415.
llvm-svn: 259388
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/test/ubsan/lit.common.cfg | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 5f8b4d1bd26..e507724edb3 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -293,6 +293,8 @@ if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") # Mac OS X prior to 10.9 had problems with exporting symbols from # libc++/libc++abi. set(SANITIZER_CAN_USE_CXXABI FALSE) +elseif(MSVC) + set(SANITIZER_CAN_USE_CXXABI FALSE) else() set(SANITIZER_CAN_USE_CXXABI TRUE) endif() diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg index e50862983d6..cd6d209ee4a 100644 --- a/compiler-rt/test/ubsan/lit.common.cfg +++ b/compiler-rt/test/ubsan/lit.common.cfg @@ -69,11 +69,6 @@ config.suffixes = ['.c', '.cc', '.cpp'] if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows']: config.unsupported = True -if config.host_os == 'Windows': - # We do not currently support enough of the Microsoft ABI for UBSan to work on - # Windows. - config.available_features.remove('cxxabi') - # Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL # because the test hangs or fails on one configuration and not the other. if config.target_arch.startswith('arm') == False and config.target_arch != 'aarch64': |
