LGTM with a nit ================ Comment at: lib/tsan/rtl/tsan_interceptors.cc:426 @@ +425,3 @@ +#if SANITIZER_FREEBSD + SetJmp(cur_thread(), sp, sp); +#else ---------------- You already pass the same value in both RSI and RDI, so revert changes to this function. http://reviews.llvm.org/D5857