chromium: Forward port musl-only patches

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

Author: kraj

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

@@ -14,19 +14,19 @@ Signed-off-by: Khem Raj <[email protected]>
 
 --- a/base/process/process_metrics_posix.cc
 +++ b/base/process/process_metrics_posix.cc
-@@ -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_CHROMEOS) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-   struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
-   return minfo.uordblks;
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
-@@ -184,7 +184,7 @@ bool MallocDumpProvider::OnMemoryDump(co
-   }
+@@ -203,7 +203,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
  #elif defined(OS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
 -#else

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

@@ -10,8 +10,6 @@ Signed-off-by: Khem Raj <[email protected]>
  .../build/Linux/include/llvm/Config/config.h         |  2 +-
  2 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index bf4b854298..da07416e38 100644
 --- a/base/debug/stack_trace_posix.cc
 +++ b/base/debug/stack_trace_posix.cc
 @@ -27,7 +27,7 @@
@@ -23,7 +21,7 @@ index bf4b854298..da07416e38 100644
  #include <execinfo.h>
  #endif
 
-@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) {
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
    // Note: code in this function is NOT async-signal safe (std::string uses
    // malloc internally).
 
@@ -32,7 +30,7 @@ index bf4b854298..da07416e38 100644
    std::string::size_type search_from = 0;
    while (search_from < text->size()) {
      // Look for the start of a mangled symbol, from search_from.
-@@ -135,7 +135,7 @@ class BacktraceOutputHandler {
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
    virtual ~BacktraceOutputHandler() = default;
  };
 
@@ -41,16 +39,16 @@ index bf4b854298..da07416e38 100644
  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.
-@@ -827,7 +827,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
-   // 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.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if !defined(__UCLIBC__) && defined(__GLIBC__) && !defined(_AIX)
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif !defined(__UCLIBC__) && defined(__GLIBC__) && !defined(_AIX)
    // 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));
-@@ -840,13 +840,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
+@@ -852,13 +852,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.
 
@@ -66,8 +64,6 @@ index bf4b854298..da07416e38 100644
  void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
                                            const char* prefix_string) const {
    StreamBacktraceOutputHandler handler(os);
-diff --git 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
-index d99a22ad1b..c317645ce8 100644
 --- 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 @@

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

@@ -17,11 +17,9 @@ Signed-off-by: Khem Raj <[email protected]>
  base/debug/stack_trace.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
-index f5e2dbba14..6691e32d01 100644
 --- a/base/debug/stack_trace.cc
 +++ b/base/debug/stack_trace.cc
-@@ -225,14 +225,14 @@ std::string StackTrace::ToString() const {
+@@ -259,14 +259,14 @@ std::string StackTrace::ToString() const
  }
  std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
    std::stringstream stream;
@@ -33,7 +31,7 @@ index f5e2dbba14..6691e32d01 100644
  }
 
  std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
+-#if !defined(__UCLIBC__) && !defined(_AIX)
 +#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
    s.OutputToStream(&os);
  #else