From 5ccc27fee21660ae172563ddfa42cf6741210313 Mon Sep 17 00:00:00 2001 From: Maxim Ostapenko Date: Mon, 26 Dec 2016 11:44:46 +0300 Subject: [PATCH] Move lsan_check_in_progress definition to lsan_common.cc. This commit fixes undefined reference error from libasan.so: /lib/libasan.so: undefined reference to `lsan_check_in_progress' occurred due to ASan runtime embeds part of LSan runtime and misses lsan_check_in_progress symbol. To overcome the issue, just move lsan_check_in_progress definition to lsan_common.cc. Change-Id: I9ed7f4d490d525bbf7ce054285afaec24716f35a Signed-off-by: Maxim Ostapenko --- libsanitizer/lsan/lsan.cc | 1 - libsanitizer/lsan/lsan_common.cc | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libsanitizer/lsan/lsan.cc b/libsanitizer/lsan/lsan.cc index c8ea483..33051ce 100644 --- a/libsanitizer/lsan/lsan.cc +++ b/libsanitizer/lsan/lsan.cc @@ -22,7 +22,6 @@ bool lsan_inited; bool lsan_init_is_running; -bool lsan_check_in_progress; namespace __lsan { diff --git a/libsanitizer/lsan/lsan_common.cc b/libsanitizer/lsan/lsan_common.cc index 2340850..866e23f 100644 --- a/libsanitizer/lsan/lsan_common.cc +++ b/libsanitizer/lsan/lsan_common.cc @@ -24,6 +24,9 @@ #include "sanitizer_common/sanitizer_report_decorator.h" #if CAN_SANITIZE_LEAKS +// TODO (chefmax): Figure out how we can avoid pollutting global namespace. +bool lsan_check_in_progress; + namespace __lsan { // This mutex is used to prevent races between DoLeakCheck and IgnoreObject, and -- 2.7.4