diff options
| author | Reid Kleckner <rnk@google.com> | 2016-09-15 15:39:52 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-09-15 15:39:52 +0000 |
| commit | c159cd75fbf59c8606b84bf3c43e7d44b5f0eb07 (patch) | |
| tree | 6a6553a9852afdc5eb6b9a4ef4cb43285adb40e8 /lib/asan/asan_win.cc | |
| parent | 1e567a616bc127fee5319a9b0e4e14b3b5e8f195 (diff) | |
Really fix the Windows sanitizer build
Don't list __sanitizer_print_memory profile as an INTERFACE_FUNCTION. It
is not exported by ASan; it is exported by user code.
Move the weak definition from asan_win.cc to sanitizer_win.cc to fix the
ubsan tests.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@281619 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_win.cc')
| -rw-r--r-- | lib/asan/asan_win.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/asan/asan_win.cc b/lib/asan/asan_win.cc index 0da76d542..58649139e 100644 --- a/lib/asan/asan_win.cc +++ b/lib/asan/asan_win.cc @@ -44,7 +44,6 @@ int __asan_should_detect_stack_use_after_return() { // __asan_default_options(). void __sanitizer_default_malloc_hook(void *ptr, uptr size) { } void __sanitizer_default_free_hook(void *ptr) { } -void __sanitizer_default_print_memory_profile(int top_percent) {} const char* __asan_default_default_options() { return ""; } const char* __asan_default_default_suppressions() { return ""; } void __asan_default_on_error() {} @@ -52,14 +51,12 @@ void __asan_default_on_error() {} #ifdef _WIN64 #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:__sanitizer_print_memory_profile=__sanitizer_default_print_memory_profile") // 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 #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:___sanitizer_print_memory_profile=___sanitizer_default_print_memory_profile") // 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 |