aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libsanitizer/ChangeLog5
-rw-r--r--libsanitizer/tsan/tsan_rtl.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index e56cef9..215c444 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-16 Markus Trippelsdorf <markus@trippelsdorf.de>
+
+ PR sanitizer/78294
+ * tsan/tsan_rtl.cc: Add missing attribute.
+
2016-11-16 Maxim Ostapenko <m.ostapenko@samsung.com>
* LOCAL_PATCHES: New file.
diff --git a/libsanitizer/tsan/tsan_rtl.cc b/libsanitizer/tsan/tsan_rtl.cc
index 07fa165..5be28ce 100644
--- a/libsanitizer/tsan/tsan_rtl.cc
+++ b/libsanitizer/tsan/tsan_rtl.cc
@@ -43,6 +43,7 @@ extern "C" void __tsan_resume() {
namespace __tsan {
#if !SANITIZER_GO && !SANITIZER_MAC
+ __attribute__((tls_model("initial-exec")))
THREADLOCAL char cur_thread_placeholder[sizeof(ThreadState)] ALIGNED(64);
#endif
static char ctx_placeholder[sizeof(Context)] ALIGNED(64);