1*4882a593SmuzhiyunFrom bccfc7999135a44fce7473ee8a60333c6d5db746 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 7 Jul 2017 14:54:38 -0700 4*4882a593SmuzhiyunSubject: [PATCH] chromium: musl: linux != glibc, make the distinction 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 7*4882a593SmuzhiyunUpstream-Status: Pending 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun chromium/base/allocator/allocator_check.cc | 2 +- 10*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc 13*4882a593Smuzhiyunindex a5ca0b7191e..7017d48b5a0 100644 14*4882a593Smuzhiyun--- a/chromium/base/allocator/allocator_check.cc 15*4882a593Smuzhiyun+++ b/chromium/base/allocator/allocator_check.cc 16*4882a593Smuzhiyun@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { 17*4882a593Smuzhiyun // Set by allocator_shim_override_ucrt_symbols_win.h when the 18*4882a593Smuzhiyun // shimmed _set_new_mode() is called. 19*4882a593Smuzhiyun return g_is_win_shim_layer_initialized; 20*4882a593Smuzhiyun-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ 21*4882a593Smuzhiyun+#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \ 22*4882a593Smuzhiyun BUILDFLAG(USE_TCMALLOC) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) 23*4882a593Smuzhiyun // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. 24*4882a593Smuzhiyun // TODO(primiano): replace with an include once base can depend on allocator. 25