[compiler-rt] r281558 - Fix the Windows build after r281546

Kostya Serebryany via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 14 16:18:11 PDT 2016


ouch...

On Wed, Sep 14, 2016 at 4:07 PM, Reid Kleckner via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: rnk
> Date: Wed Sep 14 18:07:05 2016
> New Revision: 281558
>
> URL: http://llvm.org/viewvc/llvm-project?rev=281558&view=rev
> Log:
> Fix the Windows build after r281546
>
> Modified:
>     compiler-rt/trunk/lib/asan/asan_win.cc
>
> Modified: compiler-rt/trunk/lib/asan/asan_win.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> asan/asan_win.cc?rev=281558&r1=281557&r2=281558&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/asan/asan_win.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_win.cc Wed Sep 14 18:07:05 2016
> @@ -44,6 +44,7 @@ int __asan_should_detect_stack_use_after
>  // __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() {}
> @@ -51,12 +52,14 @@ 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
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160914/8736af61/attachment.html>


More information about the llvm-commits mailing list