From d7bd8fbc0e9f0bf09aa527332ed8ec5bddcc262f Mon Sep 17 00:00:00 2001 From: Dean Michael Berris Date: Fri, 26 Aug 2016 12:31:02 +0000 Subject: [PATCH] Revert " [compiler-rt] Allow c++ abi to be explictly disabled in cmake configuration" This reverts commit 6659b10799b287ad815e49c4f1b01abc4369b03d. llvm-svn: 279818 --- compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc b/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc index f5b3cca..26272e3 100644 --- a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc +++ b/compiler-rt/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" -- 2.7.4