mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-31 08:21:49 +01:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
the pvalloc/valloc symbols are obsolete and not implemented in musl
|
|
--
|
|
--- a/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc
|
|
+++ b/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc
|
|
@@ -375,7 +375,7 @@
|
|
ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u);
|
|
ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u);
|
|
|
|
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
|
|
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__)
|
|
void* pvalloc_ptr = pvalloc(67);
|
|
ASSERT_NE(nullptr, pvalloc_ptr);
|
|
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize);
|
|
@@ -414,7 +414,7 @@
|
|
free(memalign_ptr);
|
|
ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
|
|
|
|
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
|
|
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__)
|
|
free(pvalloc_ptr);
|
|
ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
|
|
#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
|
|
--- a/base/process/memory_unittest.cc
|
|
+++ b/base/process/memory_unittest.cc
|
|
@@ -359,7 +359,7 @@
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
#endif // !BUILDFLAG(IS_MAC)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
TEST_F(OutOfMemoryDeathTest, Valloc) {
|
|
ASSERT_OOM_DEATH({
|