From 410cb4d6ef31a0cdcd67584d6a1028292a361b29 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 5 Aug 2023 23:35:21 +0800 Subject: [PATCH] musl: allocator: Disable memory tagging --- src/base/allocator/partition_allocator/partition_alloc.gni | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/base/allocator/partition_allocator/partition_alloc.gni b/src/base/allocator/partition_allocator/partition_alloc.gni index ef77a8a705..3a47de99c9 100644 --- a/src/base/allocator/partition_allocator/partition_alloc.gni +++ b/src/base/allocator/partition_allocator/partition_alloc.gni @@ -38,8 +38,13 @@ if (is_nacl) { # TODO(crbug.com/329199197): Clean this up when experiments are complete. use_large_empty_slot_span_ring = true +# Disables for Android ARM64 because it actually requires API 31+. +# See partition_alloc/tagging.cc: +# mallopt can be loaded after API 26. +# mallopt M_BIONIC_SET_HEAP_TAGGING_LEVEL can be called after API 31. +# Disables for OpenWrt Musl which lacks the required ifunc support. has_memory_tagging = - current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) + current_cpu == "arm64" && is_clang && !is_asan && is_linux && current_os != "openwrt" declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually,