summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Ostapenko <m.ostapenko@samsung.com>2016-11-08 13:45:49 +0300
committerDongkyun Son <dongkyun.s@samsung.com>2016-11-15 20:57:40 -0800
commit445f9ce07ede288c5b96a0fd90ac5a40c971fad8 (patch)
treea6a3476d4fb2d9878bbd551669d8fd263a325cb4
parent1ee1aa1b8b8c546c50e2b600a69eef9bc58beff9 (diff)
downloadlinaro-gcc-445f9ce07ede288c5b96a0fd90ac5a40c971fad8.tar.gz
linaro-gcc-445f9ce07ede288c5b96a0fd90ac5a40c971fad8.tar.bz2
linaro-gcc-445f9ce07ede288c5b96a0fd90ac5a40c971fad8.zip
Move SanitizerToolName definition before MaybeMountProcFS.
The MaybeMountProcFS uses SanitizerToolName in its failure messages so we need it defined at this point. Change-Id: I6a568e1ebf3d646ecfbdb53fd8e48910e9b66559 Signed-off-by: Maxim Ostapenko <m.ostapenko@samsung.com>
-rw-r--r--libsanitizer/asan/asan_rtl.cc2
-rw-r--r--libsanitizer/lsan/lsan.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/libsanitizer/asan/asan_rtl.cc b/libsanitizer/asan/asan_rtl.cc
index d4dfc1df4a2..7b5a1015988 100644
--- a/libsanitizer/asan/asan_rtl.cc
+++ b/libsanitizer/asan/asan_rtl.cc
@@ -407,9 +407,9 @@ static void MaybeDisableUlimit() {
static void AsanInitInternal() {
if (LIKELY(asan_inited)) return;
+ SanitizerToolName = "AddressSanitizer";
MaybeMountProcFS();
MaybeDisableUlimit();
- SanitizerToolName = "AddressSanitizer";
CHECK(!asan_init_is_running && "ASan init calls itself!");
asan_init_is_running = true;
diff --git a/libsanitizer/lsan/lsan.cc b/libsanitizer/lsan/lsan.cc
index 8d20bb6eb07..33051cef1d5 100644
--- a/libsanitizer/lsan/lsan.cc
+++ b/libsanitizer/lsan/lsan.cc
@@ -88,9 +88,9 @@ extern "C" void __lsan_init() {
CHECK(!lsan_init_is_running);
if (LIKELY(lsan_inited))
return;
+ SanitizerToolName = "LeakSanitizer";
MaybeMountProcFS();
lsan_init_is_running = true;
- SanitizerToolName = "LeakSanitizer";
CacheBinaryName();
InitializeFlags();
InitCommonLsan();