musl: allocator: Fix __THROW and mallinfo

netboylee · Jan 14, 2025 · 4789d4f · 4789d4f
1 parent 0b16ee5
commit 4789d4f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc b/src/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -293,7 +293,12 @@ void PartitionAllocMallocInitOnce() {
     return;
   }
 
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
+#if defined(__MUSL__)
+  // Musl calls malloc() in pthread_atfork(), resulting in a deadlock.
+  static_cast<void>(BeforeForkInParent);
+  static_cast<void>(AfterForkInParent);
+  static_cast<void>(AfterForkInChild);
+#elif PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
   // When fork() is called, only the current thread continues to execute in the
   // child process. If the lock is held, but *not* by this thread when fork() is
   // called, we have a deadlock.

diff --git a/..._allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc b/..._allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
@@ -739,7 +739,9 @@ SHIM_ALWAYS_EXPORT int mallopt(int cmd, int value) __THROW {
 
 #endif  // !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_ANDROID)
 
-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
+#if defined(__MUSL__) 
+// Musl does not support struct mallinfo.
+#elif PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
 SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
   partition_alloc::SimplePartitionStatsDumper allocator_dumper;
   Allocator()->DumpStats("malloc", true, &allocator_dumper);

diff --git a/src/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h b/src/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h
@@ -9,7 +9,9 @@
 
 #if defined(__GNUC__)
 
-#if PA_BUILDFLAG(IS_POSIX)
+#if defined(__MUSL__)
+// Musl does not provide sys/cdefs.h
+#elif PA_BUILDFLAG(IS_POSIX)
 #include <sys/cdefs.h>  // for __THROW
 #endif
 

diff --git a/...cator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_libc_symbols.h b/...cator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_libc_symbols.h
@@ -25,6 +25,12 @@
 
 #include "partition_alloc/shim/allocator_shim_internals.h"
 
+// Musl does not specify anything for malloc() etc.
+#if defined(__MUSL__)
+#undef __THROW
+#define __THROW
+#endif
+
 extern "C" {
 
 // WARNING: Whenever a new function is added there (which, surprisingly enough,