Index: test/tsan/java_race_pc.cc =================================================================== --- test/tsan/java_race_pc.cc +++ test/tsan/java_race_pc.cc @@ -13,7 +13,11 @@ void *Thread(void *p) { barrier_wait(&barrier); +#if defined(__mips__) + __tsan_read1_pc((jptr)p, (jptr)foobar + 8); +#else __tsan_read1_pc((jptr)p, (jptr)foobar + 1); +#endif return 0; } @@ -26,7 +30,11 @@ __tsan_java_alloc(jheap, kBlockSize); pthread_t th; pthread_create(&th, 0, Thread, (void*)jheap); +#if defined(__mips__) + __tsan_write1_pc((jptr)jheap, (jptr)barbaz + 8); +#else __tsan_write1_pc((jptr)jheap, (jptr)barbaz + 1); +#endif barrier_wait(&barrier); pthread_join(th, 0); __tsan_java_free(jheap, kBlockSize);