Skip to content

Commit caa2c1b

Browse files
committed
[compiler-rt] Do not redefine builtins on Windows
Build bots are still failing, and getting it to work on Windows should be done in a separate patch, should this even be technically feasible. | lld-link: error: | stage2_win_x64/obj/compiler-rt/lib/asan/asan_shared_library.asan_activation.obj: | memcpy should not refer to special section 0
1 parent a963dbb commit caa2c1b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_redefine_builtins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define SANITIZER_REDEFINE_BUILTINS_H
1616

1717
// The asm hack only works with GCC and Clang.
18-
#if !defined(_MSC_VER) || defined(__clang__)
18+
#if !defined(_MSC_VER)
1919

2020
asm("memcpy = __sanitizer_internal_memcpy");
2121
asm("memmove = __sanitizer_internal_memmove");
@@ -46,7 +46,7 @@ using unordered_set = Define_SANITIZER_COMMON_NO_REDEFINE_BUILTINS_in_cpp_file;
4646
using vector = Define_SANITIZER_COMMON_NO_REDEFINE_BUILTINS_in_cpp_file;
4747
} // namespace std
4848

49-
#endif // !_MSC_VER || __clang__
49+
#endif // !_MSC_VER
5050

5151
#endif // SANITIZER_REDEFINE_BUILTINS_H
5252
#endif // SANITIZER_COMMON_NO_REDEFINE_BUILTINS

0 commit comments

Comments
 (0)