[llvm-branch-commits] [compiler-rt] 34489da - [sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848

[Fangrui Song via llvm-branch-commits]

Author: Fangrui Song
Date: 2021-01-01T14:43:08-08:00
New Revision: 34489da81b39972b40d2ff5581fe48911339406e

URL: https://github.com/llvm/llvm-project/commit/34489da81b39972b40d2ff5581fe48911339406e
DIFF: https://github.com/llvm/llvm-project/commit/34489da81b39972b40d2ff5581fe48911339406e.diff

LOG: [sanitizer] Enable mallopt and mallinfo interceptors on Android after D93848

Reviewed By: aeubanks

Differential Revision: https://reviews.llvm.org/D93970

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
index 44a95d40f3f8..7f7b38d4215b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -481,7 +481,7 @@
 
 #define SANITIZER_INTERCEPT_MMAP SI_POSIX
 #define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID
-#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO SI_GLIBC
+#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID)
 #define SANITIZER_INTERCEPT_MEMALIGN \
   (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_RTEMS)
 #define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC