Index: compiler-rt/trunk/lib/asan/tests/asan_test_main.cc
===================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_test_main.cc
+++ compiler-rt/trunk/lib/asan/tests/asan_test_main.cc
@@ -22,13 +22,10 @@
   // turn symbolization off to speed up testing, especially when not running
   // with llvm-symbolizer but with atos.
   return "symbolize=false:abort_on_error=0:log_to_syslog=0";
-#elif SANITIZER_PPC || defined(__thumb__)
+#elif SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT
   // On PowerPC and ARM Thumb, a couple tests involving pthread_exit fail due to
-  // leaks detected by LSan. pthread_exit tries to perform unwinding that leads
-  // to dlopen'ing libgcc_s.so. dlopen mallocs "libgcc_s.so" string which
-  // confuses LSan, it fails to realize that this allocation happens in dynamic
-  // linker and should be ignored.  Symbolized leak report is required to define
-  // a suppression for this known problem.
+  // leaks detected by LSan. Symbolized leak report is required to apply a
+  // suppression for this known problem.
   return "";
 #else
   // Let's turn symbolization off to speed up testing (more than 3 times speedup
Index: compiler-rt/trunk/lib/lsan/lsan_common.cc
===================================================================
--- compiler-rt/trunk/lib/lsan/lsan_common.cc
+++ compiler-rt/trunk/lib/lsan/lsan_common.cc
@@ -848,7 +848,13 @@
 
 SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
 const char *__lsan_default_suppressions() {
+#if SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT
+  // The actual string allocation happens here (for more details refer to the
+  // SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT definition).
+  return "leak:*_dl_map_object_deps*";
+#else
   return "";
+#endif  // SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT
 }
 #endif
 } // extern "C"
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h
@@ -259,4 +259,15 @@
 # define SANITIZER_GO 0
 #endif
 
+// On PowerPC and ARM Thumb, calling pthread_exit() causes LSan to detect leaks.
+// pthread_exit() performs unwinding that leads to dlopen'ing libgcc_s.so.
+// dlopen mallocs "libgcc_s.so" string which confuses LSan, it fails to realize
+// that this allocation happens in dynamic linker and should be ignored.
+#if SANITIZER_PPC || defined(__thumb__)
+# define SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT 1
+#else
+# define SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT 0
+#endif
+
+
 #endif // SANITIZER_PLATFORM_H