diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-02-04 11:46:22 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-02-04 11:46:22 +0100 |
| commit | 81c87471e9ed4952d63477644b1843a42fd1fbb3 (patch) | |
| tree | e9339ebb002ea58744a5123eb12281e41abec7f1 /libsanitizer | |
| parent | 25c90aae33b79da3efe82a1d5e23879b4672de50 (diff) | |
| download | gcc-81c87471e9ed4952d63477644b1843a42fd1fbb3.zip gcc-81c87471e9ed4952d63477644b1843a42fd1fbb3.tar.gz gcc-81c87471e9ed4952d63477644b1843a42fd1fbb3.tar.bz2 | |
re PR sanitizer/60055 (Invalid binding of __tsan_default_options)
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.
From-SVN: r207459
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 94eae5e..d8147db 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 5bcf42e..158e24f 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 a0f3267..573eeb8 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; } |