[PATCH] Backport compiler-rt r200747 into libsanitizer (PR sanitizer/60055)

[Jakub Jelinek]

Hi!

This backports upstream fix for __tsan_default_options.
Committed to trunk.

2014-02-04  Jakub Jelinek  <ja...@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.

--- libsanitizer/tsan/tsan_flags.cc     (revision 200746)
+++ libsanitizer/tsan/tsan_flags.cc     (revision 200747)
@@ -29,7 +29,8 @@ extern "C" const char* __tsan_default_op
 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
--- libsanitizer/tsan/tsan_rtl.cc       (revision 200746)
+++ libsanitizer/tsan/tsan_rtl.cc       (revision 200747)
@@ -40,6 +40,7 @@ static char ctx_placeholder[sizeof(Conte
 #ifdef TSAN_EXTERNAL_HOOKS
 bool OnFinalize(bool failed);
 #else
+SANITIZER_INTERFACE_ATTRIBUTE
 bool WEAK OnFinalize(bool failed) {
   return failed;
 }

        Jakub