diff options
author | Dean Michael Berris <dberris@google.com> | 2016-08-26 12:31:02 +0000 |
---|---|---|
committer | Dean Michael Berris <dberris@google.com> | 2016-08-26 12:31:02 +0000 |
commit | 0c1fcb4fa06011fe013bba3c821737ab94c1fc59 (patch) | |
tree | dac66ebfd594ad5c5a33980c52cad0aad0c04759 /lib/ubsan | |
parent | 6659b10799b287ad815e49c4f1b01abc4369b03d (diff) |
Revert " [compiler-rt] Allow c++ abi to be explictly disabled in cmake configuration"
This reverts commit 6659b10799b287ad815e49c4f1b01abc4369b03d.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@279818 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ubsan')
-rw-r--r-- | lib/ubsan/ubsan_type_hash_itanium.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ubsan/ubsan_type_hash_itanium.cc b/lib/ubsan/ubsan_type_hash_itanium.cc index f5b3cca5b..26272e336 100644 --- a/lib/ubsan/ubsan_type_hash_itanium.cc +++ b/lib/ubsan/ubsan_type_hash_itanium.cc @@ -13,7 +13,7 @@ #include "sanitizer_common/sanitizer_platform.h" #include "ubsan_platform.h" -#if CAN_SANITIZE_UB && UBSAN_CAN_USE_CXXABI +#if CAN_SANITIZE_UB && !SANITIZER_WINDOWS #include "ubsan_type_hash.h" #include "sanitizer_common/sanitizer_common.h" |