chromium: Fix build with musl

Several patches are not needed anymore as latest chromium has either
accepted variants of them or are not needed with new musl.

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

Fixed some whitespace errors.

Signed-off-by: Narpat Mali <narpat.mali@windriver.com>

Author: kraj

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

@@ -27,29 +27,25 @@ SRC_URI += " \
     file://0018-Revert-Fix-std-span-autodetection-7805.patch \
     file://0019-Backport-Fix-deps-for-feed_response.proto.patch \
     file://0020-Only-default-operator-on-declaration.patch \
+    file://fix-libc-version-include.patch \
 "
 
 SRC_URI:append:libc-musl = "\
     file://musl/0001-mallinfo-implementation-is-glibc-specific.patch \
-    file://musl/0002-execinfo-implementation-is-glibc-specific.patch \
     file://musl/0003-Define-TEMP_FAILURE_RETRY-and-__si_fields.patch \
-    file://musl/0004-blink-Fix-build-with-musl.patch \
     file://musl/0005-breakpad-Fix-build-with-musl.patch \
     file://musl/0006-fontconfig-Musl-does-not-have-rand_r-API.patch \
     file://musl/0007-__libc_malloc-is-internal-to-glibc.patch \
-    file://musl/0008-gnu_libc_version-API-is-glibc-specific.patch \
-    file://musl/0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch \
-    file://musl/0011-crashpad-Fix-build-with-musl.patch \
     file://musl/0012-debug-Fix-build-with-musl.patch \
     file://musl/0015-mallopt-is-glibc-specific-API.patch \
     file://musl/0018--Use-monotonic-clock-for-pthread_cond_timedwait-with-.patch \
     file://musl/0020-Fix-tab-crashes-on-musl.patch \
     file://musl/0021-pthread_getname_np.patch \
     file://musl/0022-sys-stat.patch \
     file://musl/scoped-file.patch \
-    file://musl/fix-narrowing-cast.patch \
     file://musl/credentials-header.patch \
     file://musl/fstatat64.patch \
+    file://musl/no-res-ninit-nclose.patch \
 "
 
 ANY_OF_DISTRO_FEATURES = "opengl vulkan"
@@ -89,6 +85,9 @@ DEPENDS += " \
     virtual/libgl \
 "
 DEPEND:append:runtime-llvm = " compiler-rt-native libcxx-native"
+DEPENDS:append:libc-musl = " libexecinfo"
+
+LDFLAGS:append:libc-musl = " -lexecinfo"
 
 # The wrapper script we use from upstream requires bash.
 RDEPENDS:${PN} = "bash"

meta-chromium/recipes-browser/chromium/files/fix-libc-version-include.patch

@@ -0,0 +1,20 @@
+gnu/libc-version.h is only in glibc therefore guard it with __GLIBC__
+rest of the code should be working with musl too.
+
+Upstream-Status: Pending
+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
+@@ -61,9 +61,10 @@
+
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(__GLIBC__)
+ #include <gnu/libc-version.h>
+-
++#endif
+ #include "base/linux_util.h"
+ #include "base/strings/string_split.h"
+ #include "base/strings/string_util.h"

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

@@ -14,8 +14,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  sandbox/linux/suid/sandbox.c      | 9 +++++++++
  2 files changed, 14 insertions(+)
 
-diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
-index 0ef42807ae..7494bba8e3 100644
 --- a/sandbox/linux/seccomp-bpf/trap.cc
 +++ b/sandbox/linux/seccomp-bpf/trap.cc
 @@ -27,6 +27,11 @@
@@ -30,8 +28,6 @@ index 0ef42807ae..7494bba8e3 100644
  namespace {
 
  struct arch_sigsys {
-diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c
-index 2180b9d137..14be27b53d 100644
 --- a/sandbox/linux/suid/sandbox.c
 +++ b/sandbox/linux/suid/sandbox.c
 @@ -44,6 +44,15 @@
@@ -40,13 +36,13 @@ index 2180b9d137..14be27b53d 100644
 
 +#ifndef TEMP_FAILURE_RETRY
 +#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                             \
-+    ({ long int __result;                                                    \
-+       do __result = (long int) (expression);                                \
-+       while (__result == -1L && errno == EINTR);                            \
++  (__extension__ \
++    ({ long int __result; \
++       do __result = (long int) (expression); \
++       while (__result == -1L && errno == EINTR); \
 +       __result; }))
 +#endif
 +
- #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
- 
- static void FatalError(const char* msg, ...)
+ #define HANDLE_EINTR(x) ({ \
+   long eintr_wrapper_result; \
+   do { \