diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2013-08-13 11:42:45 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2013-08-13 11:42:45 +0000 |
| commit | eee13914e282bd962f621628e7538102ef186f7a (patch) | |
| tree | 4c6f133345cdd1c97a672e2f29342abf3e5e52eb /compiler-rt/lib/lsan | |
| parent | cdaffa45d440e90430bcc9b33616f086a7de6f03 (diff) | |
| download | bcm5719-llvm-eee13914e282bd962f621628e7538102ef186f7a.tar.gz bcm5719-llvm-eee13914e282bd962f621628e7538102ef186f7a.zip | |
Define SANITIZER_INTERFACE_ATTRIBUTE on Windows and fix all the places where SANITIZER_INTERFACE_ATTRIBUTE or SANITIZER_ATTRIBUTE_WEAK are used
llvm-svn: 188261
Diffstat (limited to 'compiler-rt/lib/lsan')
| -rw-r--r-- | compiler-rt/lib/lsan/lsan_common.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/lsan/lsan_common.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/compiler-rt/lib/lsan/lsan_common.cc b/compiler-rt/lib/lsan/lsan_common.cc index 265b1ce333e..8a05b0c822a 100644 --- a/compiler-rt/lib/lsan/lsan_common.cc +++ b/compiler-rt/lib/lsan/lsan_common.cc @@ -556,7 +556,7 @@ void __lsan_do_leak_check() { } #if !SANITIZER_SUPPORTS_WEAK_HOOKS -SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE int __lsan_is_turned_off() { return 0; } diff --git a/compiler-rt/lib/lsan/lsan_common.h b/compiler-rt/lib/lsan/lsan_common.h index 926dea80f15..971f7486cb3 100644 --- a/compiler-rt/lib/lsan/lsan_common.h +++ b/compiler-rt/lib/lsan/lsan_common.h @@ -166,10 +166,11 @@ class LsanMetadata { } // namespace __lsan extern "C" { -int __lsan_is_turned_off() SANITIZER_WEAK_ATTRIBUTE - SANITIZER_INTERFACE_ATTRIBUTE; -const char *__lsan_default_suppressions() SANITIZER_WEAK_ATTRIBUTE - SANITIZER_INTERFACE_ATTRIBUTE; +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE +int __lsan_is_turned_off(); + +SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE +const char *__lsan_default_suppressions(); } // extern "C" #endif // LSAN_COMMON_H |
