diff options
| author | Mike Aizatsky <aizatsky@chromium.org> | 2017-01-05 06:55:55 +0000 |
|---|---|---|
| committer | Mike Aizatsky <aizatsky@chromium.org> | 2017-01-05 06:55:55 +0000 |
| commit | 252adf7c77ccea8030f8c9e4d87df858d3c782e4 (patch) | |
| tree | b9d766a9c2174b5dfc6d0d0e05d838144818fa60 | |
| parent | 9b9e86b4bddf57da1b382e8db73710aaf7607231 (diff) | |
| download | bcm5719-llvm-252adf7c77ccea8030f8c9e4d87df858d3c782e4.tar.gz bcm5719-llvm-252adf7c77ccea8030f8c9e4d87df858d3c782e4.zip | |
[sancov] force default flags for windows
llvm-svn: 291089
| -rw-r--r-- | compiler-rt/lib/asan/asan_win.cc | 3 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sancov_flags.cc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/asan_win.cc b/compiler-rt/lib/asan/asan_win.cc index a513b081617..78268d83e53 100644 --- a/compiler-rt/lib/asan/asan_win.cc +++ b/compiler-rt/lib/asan/asan_win.cc @@ -54,7 +54,6 @@ void __sanitizer_default_free_hook(void *ptr) { } const char* __asan_default_default_options() { return ""; } const char* __asan_default_default_suppressions() { return ""; } void __asan_default_on_error() {} -const char* __sancov_default_options() { return ""; } // 64-bit msvc will not prepend an underscore for symbols. #ifdef _WIN64 #pragma comment(linker, "/alternatename:__sanitizer_malloc_hook=__sanitizer_default_malloc_hook") // NOLINT @@ -62,14 +61,12 @@ const char* __sancov_default_options() { return ""; } #pragma comment(linker, "/alternatename:__asan_default_options=__asan_default_default_options") // NOLINT #pragma comment(linker, "/alternatename:__asan_default_suppressions=__asan_default_default_suppressions") // NOLINT #pragma comment(linker, "/alternatename:__asan_on_error=__asan_default_on_error") // NOLINT -#pragma comment(linker, "/alternatename:__sancov_default_options=__sancov_default_default_options") // NOLINT #else #pragma comment(linker, "/alternatename:___sanitizer_malloc_hook=___sanitizer_default_malloc_hook") // NOLINT #pragma comment(linker, "/alternatename:___sanitizer_free_hook=___sanitizer_default_free_hook") // NOLINT #pragma comment(linker, "/alternatename:___asan_default_options=___asan_default_default_options") // NOLINT #pragma comment(linker, "/alternatename:___asan_default_suppressions=___asan_default_default_suppressions") // NOLINT #pragma comment(linker, "/alternatename:___asan_on_error=___asan_default_on_error") // NOLINT -#pragma comment(linker, "/alternatename:___sancov_default_options=___sancov_default_default_options") // NOLINT #endif // }}} } // extern "C" diff --git a/compiler-rt/lib/sanitizer_common/sancov_flags.cc b/compiler-rt/lib/sanitizer_common/sancov_flags.cc index 55e0c700f13..cef4fa948fe 100644 --- a/compiler-rt/lib/sanitizer_common/sancov_flags.cc +++ b/compiler-rt/lib/sanitizer_common/sancov_flags.cc @@ -13,6 +13,12 @@ #include "sancov_flags.h" #include "sanitizer_flag_parser.h" +#include "sanitizer_platform.h" + +#if SANITIZER_WINDOWS +// Windows doesn't have weak symbols. +extern "C" const char* __sancov_default_options() { return ""; } +#endif using namespace __sanitizer; |
