New upstream version 1.12.0+dfsg1

[rustc.git] / src / compiler-rt / test / tsan / java_race_pc.cc

diff --git a/src/compiler-rt/test/tsan/java_race_pc.cc b/src/compiler-rt/test/tsan/java_race_pc.cc
index 0745ade6c479888f6969c8ad88a10b1f77f66f6c..be1c5f26a3b165cc9696972b571ca6c7ee32df90 100644 (file)
--- a/src/compiler-rt/test/tsan/java_race_pc.cc
+++ b/src/compiler-rt/test/tsan/java_race_pc.cc
@@ -1,8 +1,8 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
-// This test fails on powerpc64 on both VMA (44 and 46).
+// This test fails on powerpc64 big endian.
 // The Tsan report is returning wrong information about
 // the location of the race.
-// XFAIL: powerpc64
+// XFAIL: powerpc64-unknown-linux-gnu
 #include "java.h"
 
 void foobar() {
@@ -13,7 +13,7 @@ void barbaz() {
 
 void *Thread(void *p) {
   barrier_wait(&barrier);
-  __tsan_read1_pc((jptr)p, (jptr)foobar + 1);
+  __tsan_read1_pc((jptr)p, (jptr)foobar + kPCInc);
   return 0;
 }
 
@@ -26,7 +26,7 @@ int main() {
   __tsan_java_alloc(jheap, kBlockSize);
   pthread_t th;
   pthread_create(&th, 0, Thread, (void*)jheap);
-  __tsan_write1_pc((jptr)jheap, (jptr)barbaz + 1);
+  __tsan_write1_pc((jptr)jheap, (jptr)barbaz + kPCInc);
   barrier_wait(&barrier);
   pthread_join(th, 0);
   __tsan_java_free(jheap, kBlockSize);