From 79510bed63948e16555a6c404206dfe52d56f0f5 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Mon, 10 Jun 2024 16:45:07 +0800 Subject: [PATCH] base/allocator: Disable ifunc on Musl aarch64 --- .../src/partition_alloc/aarch64_support.h | 2 +- .../src/partition_alloc/page_allocator_internals_posix.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h b/src/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h index 4d01be71a7..d2a190c885 100644 --- a/src/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h +++ b/src/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h @@ -10,7 +10,7 @@ #include "partition_alloc/build_config.h" #include "partition_alloc/partition_alloc_buildflags.h" -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) && !defined(__MUSL__) #define HAS_HW_CAPS #endif diff --git a/src/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc b/src/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc index 58d652f9d4..d99ddd5531 100644 --- a/src/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc +++ b/src/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc @@ -8,8 +8,9 @@ #include "partition_alloc/page_allocator.h" #include "partition_alloc/partition_alloc_buildflags.h" -#if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ - (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) +#if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ + (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \ + !defined(__MUSL__)) struct __ifunc_arg_t; #include "partition_alloc/aarch64_support.h"