summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2016-09-14 22:35:56 +0000
committerKostya Serebryany <kcc@google.com>2016-09-14 22:35:56 +0000
commit446b5d88116b51a883ce9bfb271de09c232ea86f (patch)
tree31f74394ee813ab9ee0ba9dce05e6ad9642ed1ae
parenta98496e6b0cc06226cf5a3585055042ab45c53d9 (diff)
downloadbcm5719-llvm-446b5d88116b51a883ce9bfb271de09c232ea86f.tar.gz
bcm5719-llvm-446b5d88116b51a883ce9bfb271de09c232ea86f.zip
[tsan] fix tsan build by adding a dummy __sanitizer_print_memory_profile
llvm-svn: 281553
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc2
-rw-r--r--compiler-rt/lib/tsan/rtl/tsan_rtl.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc
index 1a4c49e5ea9..843000ca5da 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc
@@ -127,7 +127,7 @@ void BackgroundThread(void *arg) {
}
}
if (allocator_release_to_os && ReleseCallback) ReleseCallback();
- if (heap_profile &&
+ if (heap_profile && /* weak */ &__sanitizer_print_memory_profile &&
current_rss_mb > rss_during_last_reported_profile * 1.1) {
Printf("\n\nHEAP PROFILE at RSS %zdMb\n", current_rss_mb);
__sanitizer_print_memory_profile(90);
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
index 8fe9bf8d1b3..47b30288ecb 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
@@ -42,6 +42,8 @@ extern "C" void __tsan_resume() {
__tsan_resumed = 1;
}
+extern "C" void __sanitizer_print_memory_profile(int percent) {} // Stub.
+
namespace __tsan {
#if !defined(SANITIZER_GO) && !SANITIZER_MAC
OpenPOWER on IntegriCloud