* tsan/tsan_rtl.h: Cherry pick upstream r226829.

From-SVN: r220013

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index de7c633c6d7dbff458ebd1d417a72e7b1301c481..e3aa1ed68d2b8c9766ed9d0a3cfa6ba7c8532bc2 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-22  Jakub Jelinek  <jakub@redhat.com>
+
+       * tsan/tsan_rtl.h: Cherry pick upstream r226829.
+
 2015-01-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR sanitizer/64435

diff --git a/libsanitizer/tsan/tsan_rtl.h b/libsanitizer/tsan/tsan_rtl.h
index 3f7873165cd9b4ef2d2397a0f86df917eb2b269e..a5b88e0c358bd965d7c24531a13fcd89a30f6320 100644 (file)
--- a/libsanitizer/tsan/tsan_rtl.h
+++ b/libsanitizer/tsan/tsan_rtl.h
@@ -679,7 +679,7 @@ void AcquireReleaseImpl(ThreadState *thr, uptr pc, SyncClock *c);
 // The trick is that the call preserves all registers and the compiler
 // does not treat it as a call.
 // If it does not work for you, use normal call.
-#if TSAN_DEBUG == 0
+#if TSAN_DEBUG == 0 && defined(__x86_64__)
 // The caller may not create the stack frame for itself at all,
 // so we create a reserve stack frame for it (1024b must be enough).
 #define HACKY_CALL(f) \