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