From: Jakub Jelinek Date: Thu, 22 Jan 2015 20:44:25 +0000 (+0100) Subject: * tsan/tsan_rtl.h: Cherry pick upstream r226829. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=19ac475f49151476e2570b737f3ba31896417e89;p=gcc.git * tsan/tsan_rtl.h: Cherry pick upstream r226829. From-SVN: r220013 --- diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index de7c633c6d7..e3aa1ed68d2 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2015-01-22 Jakub Jelinek + + * tsan/tsan_rtl.h: Cherry pick upstream r226829. + 2015-01-21 Jakub Jelinek PR sanitizer/64435 diff --git a/libsanitizer/tsan/tsan_rtl.h b/libsanitizer/tsan/tsan_rtl.h index 3f7873165cd..a5b88e0c358 100644 --- 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) \