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 82e32f006a4c2c26c5eb33afdded685ad9ab944e..c05c8c255daaf6daf2b0505c59144d8416fe7735 100644 (file)
--- 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);
 }