mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 00:06:09 +03:00
Code Issues Projects Releases Wiki Activity

musl: allocator: Disable ifunc on aarch64

Browse Source
This commit is contained in:
klzgrad 2024-06-10 16:45:07 +08:00
parent 31e8a9ff5c
commit 145f0e1350
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h
View File

@ -10,7 +10,9 @@
#include "partition_alloc/build_config.h" #include "partition_alloc/build_config.h"
#include "partition_alloc/buildflags.h" #include "partition_alloc/buildflags.h"
#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_LINUX) #if defined(__MUSL__)
// Musl does not support ifunc.
#elif PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_LINUX)
#define HAS_HW_CAPS #define HAS_HW_CAPS
#endif #endif

5
src/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
View File

@ -8,8 +8,9 @@
#include "partition_alloc/buildflags.h" #include "partition_alloc/buildflags.h"
#include "partition_alloc/page_allocator.h" #include "partition_alloc/page_allocator.h"
#if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
(defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \
!defined(__MUSL__))
struct __ifunc_arg_t; struct __ifunc_arg_t;
#include "partition_alloc/aarch64_support.h" #include "partition_alloc/aarch64_support.h"