24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From e8f8e7aa48e97b9b91858ef94f1940464a9178a3 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 7 Jul 2017 15:09:02 -0700
|
|
Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
|
|
for musl
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
chromium/base/allocator/allocator_shim.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/3rdparty/chromium/base/allocator/allocator_shim.cc b/src/3rdparty/chromium/base/allocator/allocator_shim.cc
|
|
index 95480ea4b6..1de3d1a532 100644
|
|
--- a/src/3rdparty/chromium/base/allocator/allocator_shim.cc
|
|
+++ b/src/3rdparty/chromium/base/allocator/allocator_shim.cc
|
|
@@ -266,7 +266,7 @@ void ShimFree(void* address) {
|
|
// In the case of tcmalloc we also want to plumb into the glibc hooks
|
|
// to avoid that allocations made in glibc itself (e.g., strdup()) get
|
|
// accidentally performed on the glibc heap instead of the tcmalloc one.
|
|
-#if defined(USE_TCMALLOC)
|
|
+#if defined(USE_TCMALLOC) && defined(__GLIBC__)
|
|
#include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
|
|
#endif
|
|
|