From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 4 Feb 2014 10:46:22 +0000 (+0100)
Subject: re PR sanitizer/60055 (Invalid binding of __tsan_default_options)
X-Git-Tag: releases/gcc-4.9.0~1114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81c87471e9ed4952d63477644b1843a42fd1fbb3;p=thirdparty%2Fgcc.git

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
---

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 94eae5e8b898..d8147db33640 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 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;
 }