Index: compiler-rt/trunk/test/tsan/global_race.cc
===================================================================
--- compiler-rt/trunk/test/tsan/global_race.cc
+++ compiler-rt/trunk/test/tsan/global_race.cc
@@ -13,7 +13,9 @@
 }
 
 int main() {
-  fprintf(stderr, "addr=%p\n", GlobalData);
+  // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not
+  // match to the format used in the diagnotic message.
+  fprintf(stderr, "addr=0x%012lx\n", (unsigned long) GlobalData);
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   GlobalData[2] = 43;
Index: compiler-rt/trunk/test/tsan/global_race2.cc
===================================================================
--- compiler-rt/trunk/test/tsan/global_race2.cc
+++ compiler-rt/trunk/test/tsan/global_race2.cc
@@ -13,7 +13,9 @@
 }
 
 int main() {
-  fprintf(stderr, "addr2=%p\n", &x);
+  // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not
+  // match to the format used in the diagnotic message.
+  fprintf(stderr, "addr2=0x%012lx\n", (unsigned long) &x);
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   x = 0;
Index: compiler-rt/trunk/test/tsan/global_race3.cc
===================================================================
--- compiler-rt/trunk/test/tsan/global_race3.cc
+++ compiler-rt/trunk/test/tsan/global_race3.cc
@@ -18,7 +18,9 @@
 }
 
 int main() {
-  fprintf(stderr, "addr3=%p\n", XXX::YYY::ZZZ);
+  // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not
+  // match to the format used in the diagnotic message.
+  fprintf(stderr, "addr3=0x%012lx\n", (unsigned long) XXX::YYY::ZZZ);
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   XXX::YYY::ZZZ[0] = 0;