chromium: Refresh musl patches

Fixes patch fuzz

Signed-off-by: Khem Raj <raj.khem@gmail.com>

Author: kraj

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

@@ -50,15 +50,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #endif
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
-@@ -218,7 +218,6 @@ bool MallocDumpProvider::OnMemoryDump(co
+@@ -219,7 +219,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();
  #endif
-@@ -231,6 +230,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+@@ -232,6 +231,7 @@ bool MallocDumpProvider::OnMemoryDump(co
 
    // Total allocated space is given by |uordblks|.
    allocated_objects_size = info.uordblks;
@@ -68,23 +68,23 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    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 @@
+@@ -133,7 +133,7 @@
  /* #undef HAVE_MALLCTL */
 
  /* Define to 1 if you have the `mallinfo' function. */
 -#define HAVE_MALLINFO 1
 +/* #undef HAVE_MALLINFO */
 
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
+ /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */
+ /* so we need to check glibc version for the new API to be safe */
 --- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 +++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
-@@ -125,7 +125,7 @@
+@@ -128,7 +128,7 @@
  /* #undef HAVE_MALLCTL */
 
  /* Define to 1 if you have the `mallinfo' function. */
 -#define HAVE_MALLINFO 1
 +/* #undef HAVE_MALLINFO */
 
- /* Define to 1 if you have the <malloc/malloc.h> header file. */
- /* #undef HAVE_MALLOC_MALLOC_H */
+ /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */
+ /* so we need to check glibc version for the new API to be safe */

meta-chromium/recipes-browser/chromium/files/musl/0002-execinfo-implementation-is-glibc-specific.patch

@@ -66,7 +66,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    StreamBacktraceOutputHandler handler(os);
 --- 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
-@@ -55,7 +55,7 @@
+@@ -58,7 +58,7 @@
  #define HAVE_ERRNO_H 1
 
  /* Define to 1 if you have the <execinfo.h> header file. */

meta-chromium/recipes-browser/chromium/files/musl/0007-__libc_malloc-is-internal-to-glibc.patch

@@ -11,11 +11,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  base/process/memory_linux.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/base/process/memory_linux.cc b/base/process/memory_linux.cc
-index 3bada77710..7d0341aeec 100644
 --- a/base/process/memory_linux.cc
 +++ b/base/process/memory_linux.cc
-@@ -151,7 +151,7 @@ bool UncheckedMalloc(size_t size, void** result) {
+@@ -119,7 +119,7 @@ bool UncheckedMalloc(size_t size, void**
      (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
    *result = malloc(size);
  #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)

meta-chromium/recipes-browser/chromium/files/musl/0008-gnu_libc_version-API-is-glibc-specific.patch

@@ -11,11 +11,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  .../metrics/chrome_browser_main_extra_parts_metrics.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-index 78e4af0790..0b17551d10 100644
 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -55,8 +55,9 @@
+@@ -61,8 +61,9 @@
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -26,7 +24,7 @@ index 78e4af0790..0b17551d10 100644
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
  #include "base/strings/string_util.h"
-@@ -235,7 +236,7 @@ void RecordStartupMetrics() {
+@@ -246,7 +247,7 @@ void RecordStartupMetrics() {
 
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -35,7 +33,7 @@ index 78e4af0790..0b17551d10 100644
  void RecordLinuxDistroSpecific(const std::string& version_string,
                                 size_t parts,
                                 const char* histogram_name) {
-@@ -316,7 +317,8 @@ void RecordLinuxDistro() {
+@@ -329,7 +330,8 @@ void RecordLinuxDistro() {
  void RecordLinuxGlibcVersion() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -45,7 +43,7 @@ index 78e4af0790..0b17551d10 100644
    base::Version version(gnu_get_libc_version());
 
    UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
-@@ -629,7 +631,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
+@@ -722,7 +724,7 @@ void ChromeBrowserMainExtraPartsMetrics:
        base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN};
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.

meta-chromium/recipes-browser/chromium/files/musl/0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch

@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -2536,8 +2536,7 @@ HostResolverManager::HostResolverManager
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
    NetworkChangeNotifier::AddConnectionTypeObserver(this);
    if (system_dns_config_notifier_)
      system_dns_config_notifier_->AddObserver(this);

meta-chromium/recipes-browser/chromium/files/musl/0012-debug-Fix-build-with-musl.patch

@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/base/debug/stack_trace.cc
 +++ b/base/debug/stack_trace.cc
-@@ -259,14 +259,14 @@ std::string StackTrace::ToString() const
+@@ -260,14 +260,14 @@ std::string StackTrace::ToString() const
  }
  std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
    std::stringstream stream;

meta-chromium/recipes-browser/chromium/files/musl/0013-socket-initialize-msghdr-in-a-compatible-manner.patch

@@ -22,11 +22,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  net/socket/udp_socket_posix.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
-index 988794f94f..e398f5dd67 100644
 --- a/net/socket/udp_socket_posix.cc
 +++ b/net/socket/udp_socket_posix.cc
-@@ -1152,8 +1152,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1161,8 +1161,12 @@ SendResult UDPSocketPosixSender::Interna
    for (auto& buffer : buffers)
      msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
    msgvec->reserve(buffers.size());

meta-chromium/recipes-browser/chromium/files/musl/0018--Use-monotonic-clock-for-pthread_cond_timedwait-with-.patch

@@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  v8/src/base/platform/condition-variable.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 04ea29181..d121acdc5 100644
 --- a/v8/src/base/platform/condition-variable.cc
 +++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
+@@ -20,7 +20,7 @@ namespace base {
 
  ConditionVariable::ConditionVariable() {
  #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
@@ -25,7 +23,7 @@ index 04ea29181..d121acdc5 100644
    // On Free/Net/OpenBSD and Linux with glibc we can change the time
    // source for pthread_cond_timedwait() to use the monotonic clock.
    pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
        &native_handle_, &mutex->native_handle(), &ts);
  #else
  #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
@@ -34,6 +32,3 @@ index 04ea29181..d121acdc5 100644
    // On Free/Net/OpenBSD and Linux with glibc we can change the time
    // source for pthread_cond_timedwait() to use the monotonic clock.
    result = clock_gettime(CLOCK_MONOTONIC, &ts);
--- 
-2.31.0
-

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

@@ -57,23 +57,23 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  }
 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -417,6 +417,7 @@ bool SyscallSets::IsAllowedProcessStartO
+@@ -418,6 +418,7 @@ bool SyscallSets::IsAllowedProcessStartO
  #if defined(__i386__)
      case __NR_waitpid:
  #endif
 +    case __NR_set_tid_address:
        return true;
      case __NR_clone:  // Should be parameter-restricted.
      case __NR_setns:  // Privileged.
-@@ -429,7 +430,6 @@ bool SyscallSets::IsAllowedProcessStartO
+@@ -430,7 +431,6 @@ bool SyscallSets::IsAllowedProcessStartO
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
      case __NR_set_thread_area:
  #endif
 -    case __NR_set_tid_address:
      case __NR_unshare:
  #if !defined(__mips__) && !defined(__aarch64__)
      case __NR_vfork:
-@@ -543,6 +543,8 @@ bool SyscallSets::IsAllowedAddressSpaceA
+@@ -544,6 +544,8 @@ bool SyscallSets::IsAllowedAddressSpaceA
      case __NR_mlock:
      case __NR_munlock:
      case __NR_munmap:
@@ -82,7 +82,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
        return true;
      case __NR_madvise:
      case __NR_mincore:
-@@ -560,7 +562,6 @@ bool SyscallSets::IsAllowedAddressSpaceA
+@@ -561,7 +563,6 @@ bool SyscallSets::IsAllowedAddressSpaceA
      case __NR_modify_ldt:
  #endif
      case __NR_mprotect: