Commit 542fb41b authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merge r368103 '[TSAN] Fix tsan on FreeBSD after D54889' 

llvm-svn: 368426
parent ffa29fd9

compiler-rt/lib/tsan/rtl/tsan_rtl.cc

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static void BackgroundThread(void *arg) { 
  // 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;

compiler-rt/test/tsan/ignored-interceptors-mmap.cc

+1 −1
Original line number Diff line number Diff line 
// 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>