chromium: Refresh musl patches

Drop patches which are not needed anymore

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

Author: kraj

meta-chromium/recipes-browser/chromium/chromium-gn.inc

@@ -34,9 +34,7 @@ SRC_URI_append_libc-musl = "\
         file://musl/musl_gnu_libc-version.patch \
         file://musl/musl_resolver.patch \
         file://musl/musl_off64_t.patch \
-        file://musl/musl_lss-match_syscalls.patch \
         file://musl/musl_crashpad.patch \
-        file://musl/musl_replace_libc_fpstate.patch \
         file://musl/musl_fix_stack_trace.patch \
         file://musl/musl_portable_msghdr.patch \
         file://musl/musl_no__environ.patch \

meta-chromium/recipes-browser/chromium/files/musl/musl_breakpad.patch

@@ -6,8 +6,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
 +++ b/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,7 @@
- #include <elf.h>
+@@ -37,6 +37,7 @@
+ #include <limits.h>
  #include <link.h>
  #include <stddef.h>
 +#include <sys/reg.h>

meta-chromium/recipes-browser/chromium/files/musl/musl_fix-stack.patch

@@ -6,16 +6,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/third_party/blink/renderer/platform/wtf/stack_util.cc
 +++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() {
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
 
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
      defined(OS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() {
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
  }
 
  void* GetStackStart() {

meta-chromium/recipes-browser/chromium/files/musl/musl_fix_stack_trace.patch

@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/base/debug/stack_trace.cc
 +++ b/base/debug/stack_trace.cc
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const
+@@ -225,14 +225,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/musl_gnu_libc-version.patch

@@ -7,7 +7,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -46,8 +46,9 @@
+@@ -51,8 +51,9 @@
  #endif  // defined(OS_ANDROID) && defined(__arm__)
 
  #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -18,16 +18,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
  #include "base/strings/string_util.h"
-@@ -238,7 +239,7 @@ void RecordStartupMetrics() {
-                             shell_integration::NUM_DEFAULT_STATES);
+@@ -229,7 +230,7 @@ void RecordStartupMetrics() {
+ #endif
  }
 
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(__GLIBC__) && !defined(OS_CHROMEOS)
- void RecordLinuxDistro() {
-   UMALinuxDistro distro_result = UMA_LINUX_DISTRO_UNKNOWN;
- 
-@@ -348,7 +349,7 @@ void RecordLinuxDistro() {
+ void RecordLinuxDistroSpecific(const std::string& version_string,
+                                size_t parts,
+                                const char* histogram_name) {
+@@ -308,7 +309,7 @@ void RecordLinuxDistro() {
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 
  void RecordLinuxGlibcVersion() {
@@ -36,12 +36,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    base::Version version(gnu_get_libc_version());
 
    UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
-@@ -569,7 +570,7 @@ void ChromeBrowserMainExtraPartsMetrics:
-   constexpr base::TaskTraits background_task_traits = {
-       base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT,
+@@ -565,7 +566,7 @@ void ChromeBrowserMainExtraPartsMetrics:
+   constexpr base::TaskTraits kBestEffortTaskTraits = {
+       base::MayBlock(), base::TaskPriority::BEST_EFFORT,
        base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN};
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(__GLIBC__) && !defined(OS_CHROMEOS)
-   base::PostTask(FROM_HERE, background_task_traits,
-                  base::BindOnce(&RecordLinuxDistro));
+   base::ThreadPool::PostTask(FROM_HERE, kBestEffortTaskTraits,
+                              base::BindOnce(&RecordLinuxDistro));
  #endif

meta-chromium/recipes-browser/chromium/files/musl/musl_libc_malloc.patch

@@ -7,12 +7,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/base/process/memory_linux.cc
 +++ b/base/process/memory_linux.cc
-@@ -132,7 +132,7 @@ bool UncheckedMalloc(size_t size, void**
-     (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
+@@ -151,7 +151,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
    *result = malloc(size);
- #elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
 -  *result = __libc_malloc(size);
 +  *result = malloc(size);
- #elif defined(USE_TCMALLOC)
+ #elif BUILDFLAG(USE_TCMALLOC)
    *result = tc_malloc_skip_new_handler(size);
  #endif

meta-chromium/recipes-browser/chromium/files/musl/musl_lss-match_syscalls.patch

@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #include <execinfo.h>
  #endif
 
-@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text)
+@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text)
    // Note: code in this function is NOT async-signal safe (std::string uses
    // malloc internally).
 
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    std::string::size_type search_from = 0;
    while (search_from < text->size()) {
      // Look for the start of a mangled symbol, from search_from.
-@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
+@@ -135,7 +135,7 @@ class BacktraceOutputHandler {
    virtual ~BacktraceOutputHandler() = default;
  };
 
@@ -32,7 +32,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
    // This should be more than enough to store a 64-bit number in hex:
    // 16 hex digits + 1 for null-terminator.
-@@ -812,7 +812,7 @@ size_t CollectStackTrace(void** trace, s
+@@ -827,7 +827,7 @@ size_t CollectStackTrace(void** trace, s
    // NOTE: This code MUST be async-signal safe (it's used by in-process
    // stack dumping signal handler). NO malloc or stdio is allowed here.
 
@@ -41,7 +41,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    // Though the backtrace API man page does not list any possible negative
    // return values, we take no chance.
    return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -825,13 +825,13 @@ void StackTrace::PrintWithPrefix(const c
+@@ -840,13 +840,13 @@ void StackTrace::PrintWithPrefix(const c
  // NOTE: This code MUST be async-signal safe (it's used by in-process
  // stack dumping signal handler). NO malloc or stdio is allowed here.
 
@@ -59,22 +59,6 @@ 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
-@@ -8,13 +8,13 @@
- #define BUG_REPORT_URL "http://llvm.org/bugs/"
- 
- /* Define to 1 to enable backtraces, and to 0 otherwise. */
--#define ENABLE_BACKTRACES 1
-+#define ENABLE_BACKTRACES 0
- 
- /* Define to 1 to enable crash overrides, and to 0 otherwise. */
- #define ENABLE_CRASH_OVERRIDES 1
- 
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+#define HAVE_BACKTRACE 0
- 
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
 @@ -55,7 +55,7 @@
  #define HAVE_ERRNO_H 1
 

meta-chromium/recipes-browser/chromium/files/musl/musl_no_execinfo.patch

@@ -4,39 +4,26 @@ Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/base/process/process_metrics_posix.cc
 +++ b/base/process/process_metrics_posix.cc
-@@ -110,7 +110,7 @@ size_t ProcessMetrics::GetMallocUsage()
+@@ -119,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage()
    malloc_statistics_t stats = {0};
    malloc_zone_statistics(nullptr, &stats);
    return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
  #if BUILDFLAG(USE_TCMALLOC)
    return minfo.uordblks;
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
-@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+@@ -163,7 +163,7 @@ bool MallocDumpProvider::OnMemoryDump(co
    }
  #elif defined(OS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
 -#else
 +#elif defined(__GLIBC__)
    struct mallinfo info = mallinfo();
- #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
-   // Sanitizers override mallinfo.
---- a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-@@ -122,8 +122,9 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
-+#ifdef __GLIBC__
- #define HAVE_MALLINFO 1
--
-+#endif
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
- 
+   // 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
 --- 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/musl_no_mallinfo.patch

@@ -9,8 +9,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    // Set by allocator_shim_override_ucrt_symbols_win.h when the
    // shimmed _set_new_mode() is called.
    return g_is_win_shim_layer_initialized;
--#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
-+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
-     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
++#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \
+     BUILDFLAG(USE_TCMALLOC) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
  // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
  // TODO(primiano): replace with an include once base can depend on allocator.