Index: compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp =================================================================== --- compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp +++ compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp @@ -12,7 +12,7 @@ #include "sanitizer_common/sanitizer_platform.h" #include "ubsan_platform.h" -#if CAN_SANITIZE_UB && !SANITIZER_WINDOWS +#if CAN_SANITIZE_UB && (!SANITIZER_WINDOWS || defined(__MINGW32__)) #include "ubsan_type_hash.h" #include "sanitizer_common/sanitizer_common.h" Index: compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp =================================================================== --- compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp +++ compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp @@ -12,7 +12,7 @@ #include "sanitizer_common/sanitizer_platform.h" #include "ubsan_platform.h" -#if CAN_SANITIZE_UB && SANITIZER_WINDOWS +#if CAN_SANITIZE_UB && SANITIZER_WINDOWS && !defined(__MINGW32__) #include "ubsan_type_hash.h" #include "sanitizer_common/sanitizer_common.h"