tsan: fix build after 287632

1. Mac does not have MAP_32BIT.
Define it to 0 if it is not defined.

2. We are lacking nolibc stub for ListOfModules::init.
Add it.

llvm-svn: 287634

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc b/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc
index 59edcba..ba54c73 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc
@@ -29,4 +29,8 @@ void Abort() { internal__exit(1); }
 void SleepForSeconds(int seconds) { internal_sleep(seconds); }
 #endif // !SANITIZER_WINDOWS
 
+#if !SANITIZER_WINDOWS && !SANITIZER_MAC
+void ListOfModules::init() {}
+#endif
+
 }  // namespace __sanitizer

diff --git a/compiler-rt/test/tsan/ignore_lib5.cc b/compiler-rt/test/tsan/ignore_lib5.cc
index 6040435..330f110 100644 (file)
--- a/compiler-rt/test/tsan/ignore_lib5.cc
+++ b/compiler-rt/test/tsan/ignore_lib5.cc
@@ -23,6 +23,10 @@
 #include <string>
 #include "test.h"
 
+#ifndef MAP_32BIT
+# define MAP_32BIT 0
+#endif
+
 void *thr(void *arg) {
   // This thread creates lots of separate mappings in /proc/self/maps before
   // the ignored library.