chromium: Fix build with libc++ runtime on musl and update patches

libc++ does not like the conversions to long for one parameter only
therefore cast both to unsigned so it matches the LHS too

Fix mallinfo remains

Extend res_ninit fix to new files

Provide __close on musl

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

Author: kraj

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

@@ -49,6 +49,7 @@ SRC_URI:append:libc-musl = "\
     file://musl/0019-adjust-thread-stack-sizes.patch \
     file://musl/0020-Fix-tab-crashes-on-musl.patch \
     file://musl/0021-pthread_getname_np.patch \
+    file://musl/scoped-file.patch \
 "
 
 ANY_OF_DISTRO_FEATURES = "opengl vulkan"

meta-chromium/recipes-browser/chromium/files/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch

@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <[email protected]>
    // the alternative stack. Ensure that the size of the alternative stack is
    // large enough.
 -  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+  static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
++  static const unsigned kSigStackSize = std::max(static_cast<unsigned>(16384), static_cast<unsigned>(SIGSTKSZ));
 
    // Only set an alternative stack if there isn't already one, or if the current
    // one is too small.

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

@@ -23,6 +23,15 @@ Signed-off-by: Khem Raj <[email protected]>
  namespace {
 
  size_t GetMallocUsageMallinfo() {
+@@ -134,7 +134,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)
+   return GetMallocUsageMallinfo();
+ #elif defined(OS_FUCHSIA)
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
 @@ -203,7 +203,7 @@ bool MallocDumpProvider::OnMemoryDump(co
@@ -67,3 +76,32 @@ Signed-off-by: Khem Raj <[email protected]>
 
  /* Define to 1 if you have the <malloc/malloc.h> header file. */
  /* #undef HAVE_MALLOC_MALLOC_H */
+--- a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -14,7 +14,7 @@ limitations under the License.
+ ==============================================================================*/
+ #include "tensorflow/lite/profiling/memory_info.h"
+ 
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <malloc.h>
+ #include <sys/resource.h>
+ #include <sys/time.h>
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;

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

@@ -91,3 +91,42 @@ Signed-off-by: Khem Raj <[email protected]>
  namespace net {
 
  namespace {
+--- a/net/dns/dns_config_service_linux.cc
++++ b/net/dns/dns_config_service_linux.cc
+@@ -35,6 +35,36 @@
+ #include "net/dns/serial_worker.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
++#if !defined(__GLIBC__)
++/***************************************************************************
++ * resolv_compat.h
++ *
++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
++ * Note: res_init() is actually deprecated according to
++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
++ **************************************************************************/
++#include <string.h>
++
++static inline int res_ninit(res_state statp)
++{
++       int rc = res_init();
++       if (statp != &_res) {
++               memcpy(statp, &_res, sizeof(*statp));
++       }
++       return rc;
++}
++
++static inline int res_nclose(res_state statp)
++{
++       if (!statp)
++               return -1;
++       if (statp != &_res) {
++               memset(statp, 0, sizeof(*statp));
++       }
++       return 0;
++}
++#endif
++
+ namespace net {
+ 
+ namespace internal {

meta-chromium/recipes-browser/chromium/files/musl/scoped-file.patch

@@ -0,0 +1,36 @@
+provide __close on musl
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+
+--- a/base/files/scoped_file_linux.cc
++++ b/base/files/scoped_file_linux.cc
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <array>
+ #include <atomic>
++#include <dlfcn.h>
+
+ #include "base/compiler_specific.h"
+ #include "base/debug/stack_trace.h"
+@@ -80,9 +81,18 @@ bool IsFDOwned(int fd) {
+
+ extern "C" {
+
+-int __close(int);
+-
+ __attribute__((visibility("default"), noinline)) int close(int fd) {
++  static int (*__close)(int) = nullptr;
++
++  if (__close == nullptr) {
++    __close = (int (*)(int))dlsym(RTLD_NEXT, "close");
++
++    if (__close == nullptr) {
++      RAW_LOG(ERROR, "musl close not found\n");
++      IMMEDIATE_CRASH();
++    }
++  }
++
+   if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+     CrashOnFdOwnershipViolation();
+   return __close(fd);