projects/aports·blob master · refs

33 lines · 1.4 KiB

1the pvalloc/valloc symbols are obsolete and not implemented in musl
2--
3--- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
4+++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
5@@ -410,7 +410,7 @@
6 ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u);
7 ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u);
8
9-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
10+#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID)
11 void* pvalloc_ptr = pvalloc(67);
12 ASSERT_NE(nullptr, pvalloc_ptr);
13 ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize);
14@@ -449,7 +449,7 @@
15 free(memalign_ptr);
16 ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
17
18-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
19+#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID)
20 free(pvalloc_ptr);
21 ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
22 #endif // PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
23--- a/base/process/memory_unittest.cc
24+++ b/base/process/memory_unittest.cc
25@@ -359,7 +359,7 @@
26 #endif // BUILDFLAG(IS_WIN)
27 #endif // !BUILDFLAG(IS_MAC)
28
29-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
30+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
31
32 TEST_F(OutOfMemoryDeathTest, Valloc) {
33 ASSERT_OOM_DEATH({