Differential D18757 Diff 55427 www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni
--- src/3rdparty/chromium/build/config/allocator.gni.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/build/config/allocator.gni.orig 2018-11-13 18:25:11 UTC | ||||
+++ src/3rdparty/chromium/build/config/allocator.gni | +++ src/3rdparty/chromium/build/config/allocator.gni | ||||
@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al | @@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni") | ||||
assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") | |||||
assert( | # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. | ||||
- !use_experimental_allocator_shim || is_linux || is_android || is_win, | if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || | ||||
+ !use_experimental_allocator_shim || is_linux || is_android || is_win || is_bsd, | - is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { | ||||
"use_experimental_allocator_shim supported only on Linux, Android and Windows targets") | + is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { | ||||
_default_allocator = "none" | |||||
if (is_win && use_experimental_allocator_shim) { | } else { | ||||
_default_allocator = "tcmalloc" | |||||
@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls | |||||
# against the debug CRT with "is_nacl=false". | |||||
if ((is_linux || is_android || is_mac || | |||||
(is_win && !is_shared && !is_debug)) && !is_asan && !is_lsan && | |||||
- !is_tsan && !is_msan) { | |||||
+ !is_tsan && !is_msan && !is_bsd) { | |||||
_default_use_allocator_shim = true | |||||
} else { | |||||
_default_use_allocator_shim = false |