diff options
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 5 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_flags.cc | 3 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_rtl.cc | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 94eae5e8b89..d8147db3364 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,5 +1,10 @@ 2014-02-04 Jakub Jelinek <jakub@redhat.com> + PR sanitizer/60055 + * tsan/tsan_flags.cc (__tsan_default_options): Add + SANITIZER_INTERFACE_ATTRIBUTE. Backport from upstream r200747. + * tsan/tsan_rtl.cc (__tsan::OnFinalize): Likewise. + PR sanitizer/60038 * sanitizer_common/sanitizer_linux_libcdep.cc: Include sanitizer_atomic.h and unistd.h. diff --git a/libsanitizer/tsan/tsan_flags.cc b/libsanitizer/tsan/tsan_flags.cc index 5bcf42e39ea..158e24f8241 100644 --- a/libsanitizer/tsan/tsan_flags.cc +++ b/libsanitizer/tsan/tsan_flags.cc @@ -29,7 +29,8 @@ extern "C" const char* __tsan_default_options(); void WEAK OverrideFlags(Flags *f) { (void)f; } -extern "C" const char *WEAK __tsan_default_options() { +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +const char *WEAK __tsan_default_options() { return ""; } #endif diff --git a/libsanitizer/tsan/tsan_rtl.cc b/libsanitizer/tsan/tsan_rtl.cc index a0f32673fbb..573eeb8a918 100644 --- a/libsanitizer/tsan/tsan_rtl.cc +++ b/libsanitizer/tsan/tsan_rtl.cc @@ -40,6 +40,7 @@ static char ctx_placeholder[sizeof(Context)] ALIGNED(64); #ifdef TSAN_EXTERNAL_HOOKS bool OnFinalize(bool failed); #else +SANITIZER_INTERFACE_ATTRIBUTE bool WEAK OnFinalize(bool failed) { return failed; } |