git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2014-02-04 11:46:22 +01:00 committed by Jakub Jelinek
parent 25c90aae33
commit 81c87471e9
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsanitizer/ChangeLog
View File

@ -1,5 +1,10 @@
2014-02-04 Jakub Jelinek <jakub@redhat.com> 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 PR sanitizer/60038
* sanitizer_common/sanitizer_linux_libcdep.cc: Include * sanitizer_common/sanitizer_linux_libcdep.cc: Include
sanitizer_atomic.h and unistd.h. sanitizer_atomic.h and unistd.h.

3
libsanitizer/tsan/tsan_flags.cc
View File

@ -29,7 +29,8 @@ extern "C" const char* __tsan_default_options();
void WEAK OverrideFlags(Flags *f) { void WEAK OverrideFlags(Flags *f) {
(void)f; (void)f;
} }
extern "C" const char *WEAK __tsan_default_options() { extern "C" SANITIZER_INTERFACE_ATTRIBUTE
const char *WEAK __tsan_default_options() {
return ""; return "";
} }
#endif #endif

1
libsanitizer/tsan/tsan_rtl.cc
View File

@ -40,6 +40,7 @@ static char ctx_placeholder[sizeof(Context)] ALIGNED(64);
#ifdef TSAN_EXTERNAL_HOOKS #ifdef TSAN_EXTERNAL_HOOKS
bool OnFinalize(bool failed); bool OnFinalize(bool failed);
#else #else
SANITIZER_INTERFACE_ATTRIBUTE
bool WEAK OnFinalize(bool failed) { bool WEAK OnFinalize(bool failed) {
return failed; return failed;
} }