chromium: Foward port musl patches

Latest update created some conflicts in musl patches.

Signed-off-by: Khem Raj <[email protected]>

Author: kraj

meta-chromium/recipes-browser/chromium/files/musl/0001-mallinfo-implementation-is-glibc-specific.patch

@@ -50,15 +50,22 @@ Signed-off-by: Khem Raj <[email protected]>
  #endif
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
-@@ -203,7 +203,7 @@ bool MallocDumpProvider::OnMemoryDump(co
-                      &allocated_objects_count);
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
+@@ -218,7 +218,6 @@ bool MallocDumpProvider::OnMemoryDump(co
+ #define MALLINFO2_FOUND_IN_LIBC
+   struct mallinfo2 info = mallinfo2();
+ #endif
+-#endif  // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if !defined(MALLINFO2_FOUND_IN_LIBC)
    struct mallinfo info = mallinfo();
-   // In case of Android's jemalloc |arena| is 0 and the outer pages size is
-   // reported by |hblkhd|. In case of dlmalloc the total is given by
+ #endif
+@@ -231,6 +230,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+ 
+   // Total allocated space is given by |uordblks|.
+   allocated_objects_size = info.uordblks;
++#endif  // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #endif
+ 
+   MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
 --- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 +++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 @@ -130,7 +130,7 @@

meta-chromium/recipes-browser/chromium/files/musl/0019-adjust-thread-stack-sizes.patch

@@ -13,11 +13,9 @@ Signed-off-by: Khem Raj <[email protected]>
  chrome/app/shutdown_signal_handlers_posix.cc | 8 ++++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
-diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
-index de2e0c169..53cb90def 100644
 --- a/base/threading/platform_thread_linux.cc
 +++ b/base/threading/platform_thread_linux.cc
-@@ -437,7 +437,8 @@ void TerminateOnThread() {}
+@@ -439,7 +439,8 @@ void TerminateOnThread() {}
 
  size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
  #if !defined(THREAD_SANITIZER)
@@ -27,10 +25,19 @@ index de2e0c169..53cb90def 100644
  #else
    // ThreadSanitizer bloats the stack heavily. Evidence has been that the
    // default stack size isn't enough for some browser tests.
-diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
-index 621d441e8..472a3a878 100644
---- a/chrome/app/shutdown_signal_handlers_posix.cc
-+++ b/chrome/app/shutdown_signal_handlers_posix.cc
+--- a/base/threading/platform_thread_unittest.cc
++++ b/base/threading/platform_thread_unittest.cc
+@@ -408,7 +408,7 @@ TEST(PlatformThreadTest, GetDefaultThrea
+     ((defined(OS_LINUX) || defined(OS_CHROMEOS)) &&              \
+      !defined(THREAD_SANITIZER)) ||                              \
+     (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER))
+-  EXPECT_EQ(0u, stack_size);
++  EXPECT_EQ(1u << 23, stack_size);
+ #else
+   EXPECT_GT(stack_size, 0u);
+   EXPECT_LT(stack_size, 20u * (1 << 20));
+--- a/chrome/browser/shutdown_signal_handlers_posix.cc
++++ b/chrome/browser/shutdown_signal_handlers_posix.cc
 @@ -187,11 +187,19 @@ void InstallShutdownSignalHandlers(
    g_shutdown_pipe_read_fd = pipefd[0];
    g_shutdown_pipe_write_fd = pipefd[1];
@@ -51,6 +58,3 @@ index 621d441e8..472a3a878 100644
  #endif
    ShutdownDetector* detector = new ShutdownDetector(
        g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
--- 
-2.31.0
-

meta-chromium/recipes-browser/chromium/files/musl/0020-Fix-tab-crashes-on-musl.patch

@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <[email protected]>
 
 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -130,21 +130,11 @@ namespace sandbox {
+@@ -138,21 +138,11 @@ namespace sandbox {
  // present (as in newer versions of posix_spawn).
  ResultExpr RestrictCloneToThreadsAndEPERMFork() {
    const Arg<unsigned long> flags(0);
@@ -46,7 +46,7 @@ Signed-off-by: Khem Raj <[email protected]>
 
    // The following two flags are the two important flags in any vfork-emulating
    // clone call. EPERM any clone call that contains both of them.
-@@ -154,7 +144,7 @@ ResultExpr RestrictCloneToThreadsAndEPER
+@@ -162,7 +152,7 @@ ResultExpr RestrictCloneToThreadsAndEPER
        AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
              (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
 
@@ -92,8 +92,8 @@ Signed-off-by: Khem Raj <[email protected]>
      case __NR_readahead:
 --- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
 +++ b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1119,4 +1119,8 @@
- #define __NR_rseq 293
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
  #endif
 
 +#if !defined(__NR_membarrier)
@@ -103,8 +103,8 @@ Signed-off-by: Khem Raj <[email protected]>
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
 --- a/sandbox/linux/system_headers/arm_linux_syscalls.h
 +++ b/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1605,6 +1605,10 @@
- #define __NR_mount_setattr (__NR_SYSCALL_BASE + 442)
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
  #endif
 
 +#if !defined(__NR_membarrier)
@@ -126,8 +126,8 @@ Signed-off-by: Khem Raj <[email protected]>
  #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
 --- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
 +++ b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
+@@ -1415,4 +1415,8 @@
+ #define __NR_landlock_restrict_self (__NR_Linux + 446)
  #endif
 
 +#if !defined(__NR_membarrier)
@@ -137,8 +137,8 @@ Signed-off-by: Khem Raj <[email protected]>
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
 --- a/sandbox/linux/system_headers/mips_linux_syscalls.h
 +++ b/sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1685,4 +1685,8 @@
- #define __NR_mount_setattr (__NR_Linux + 442)
+@@ -1697,4 +1697,8 @@
+ #define __NR_landlock_restrict_self (__NR_Linux + 446)
  #endif
 
 +#if !defined(__NR_membarrier)
@@ -148,8 +148,8 @@ Signed-off-by: Khem Raj <[email protected]>
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
 --- a/sandbox/linux/system_headers/x86_64_linux_syscalls.h
 +++ b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1350,5 +1350,9 @@
- #define __NR_rseq 334
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
  #endif
 
 +#if !defined(__NR_membarrier)