From e15f424cf93264323eeba6dfae11a6cf9d842ee1 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Wed, 4 Nov 2020 18:28:51 -0800 Subject: [PATCH] [LSAN] Fix CAN_SANITIZE_LEAKS on Android --- compiler-rt/lib/lsan/lsan_common.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/compiler-rt/lib/lsan/lsan_common.h b/compiler-rt/lib/lsan/lsan_common.h index 53d7fad..a167cac 100644 --- a/compiler-rt/lib/lsan/lsan_common.h +++ b/compiler-rt/lib/lsan/lsan_common.h @@ -29,17 +29,13 @@ // To enable LeakSanitizer on a new architecture, one needs to implement the // internal_clone function as well as (probably) adjust the TLS machinery for // the new architecture inside the sanitizer library. -#if (SANITIZER_LINUX && \ - (!SANITIZER_ANDROID || defined(ANDROID_HAS_ELF_TLS)) || \ - SANITIZER_MAC) && \ +#if ((SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC) && \ (SANITIZER_WORDSIZE == 64) && \ (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__) || \ defined(__powerpc64__) || defined(__s390x__)) #define CAN_SANITIZE_LEAKS 1 -#elif defined(__i386__) && \ - (SANITIZER_LINUX && \ - (!SANITIZER_ANDROID || defined(ANDROID_HAS_ELF_TLS)) || \ - SANITIZER_MAC) +#elif defined(__i386__) && \ + ((SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC) #define CAN_SANITIZE_LEAKS 1 #elif defined(__arm__) && SANITIZER_LINUX && !SANITIZER_ANDROID #define CAN_SANITIZE_LEAKS 1 -- 2.7.4