Index: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cpp
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cpp
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cpp
@@ -149,6 +149,7 @@
   // We don't use ScopedIgnoreInterceptors, because we want ignores to be
   // enabled even when the thread function exits (e.g. during pthread thread
   // shutdown code).
+  cur_thread_init();
   cur_thread()->ignore_interceptors++;
   const u64 kMs2Ns = 1000 * 1000;
 
Index: compiler-rt/trunk/test/tsan/ignored-interceptors-mmap.cpp
===================================================================
--- compiler-rt/trunk/test/tsan/ignored-interceptors-mmap.cpp
+++ compiler-rt/trunk/test/tsan/ignored-interceptors-mmap.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx_tsan -O0 %s -o %t
 // RUN: not %run %t        2>&1 | FileCheck %s --check-prefix=CHECK-RACE
 // RUN:     %run %t ignore 2>&1 | FileCheck %s --check-prefix=CHECK-IGNORE
-// XFAIL: freebsd,netbsd
+// XFAIL: netbsd
 
 #include <sys/mman.h>
 #include <string.h>