diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-04 10:46:22 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-04 10:46:22 +0000 |
| commit | af20e853f573d8f0c762caf56e2d92d895bdf323 (patch) | |
| tree | e9339ebb002ea58744a5123eb12281e41abec7f1 /libsanitizer/tsan | |
| parent | fa5e2ece492f6719d6485bcf2889dc58b22eea5c (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207459 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/tsan')
| -rw-r--r-- | libsanitizer/tsan/tsan_flags.cc | 3 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_rtl.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libsanitizer/tsan/tsan_flags.cc b/libsanitizer/tsan/tsan_flags.cc index 5bcf42e39ea5..158e24f82412 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 a0f32673fbb7..573eeb8a9188 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; } |