diff options
| -rw-r--r-- | libsanitizer/ChangeLog | 4 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_rtl.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index de7c633..e3aa1ed 100644 --- 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 3f78731..a5b88e0 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) \ |