I would drop support for valgrind-based tsan completely. When we'll need to test llvm for threading issues again, we'll need to make it tsan2-clean. Nick? Agree about memcheck. How about creating a file e.g. lib/Support/DynamicTools.h and including files from compiler-rt/include there? http://llvm-reviews.chandlerc.com/D336