From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 5 Sep 2011 15:32:39 +0000 (+0000)
Subject: Avoid hanging on older s390x systems.
X-Git-Tag: svn/VALGRIND_3_7_0~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05ee2cb5c94f706062685e6df0aefaa6a888d4af;p=thirdparty%2Fvalgrind.git

Avoid hanging on older s390x systems.
See also bugzilla #268623 comment 3.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12008
---

diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c
index 82e32f006a..c05c8c255d 100644
--- a/helgrind/tests/annotate_hbefore.c
+++ b/helgrind/tests/annotate_hbefore.c
@@ -245,8 +245,13 @@ void do_wait ( UWord* w )
 {
   UWord w0 = *w;
   UWord volatile * wV = w;
-  while (*wV == w0)
+  while (*wV == w0) {
+#ifdef VGA_s390x
+    asm volatile ("bcr 15,0\n\t");  /* load barrier */
+#else
     ;
+#endif
+  }
   ANNOTATE_HAPPENS_AFTER(w);
 }