[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     36756f98fbabfc24deb746ac7574380a99191959
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 18:21:55 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  7 18:21:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36756f98

www-client/chromium: update compiler patch

Should fix gn failure with clang.

Closes: https://bugs.gentoo.org/905798
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../chromium/files/chromium-113-compiler.patch     | 50 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/www-client/chromium/files/chromium-113-compiler.patch b/www-client/chromium/files/chromium-113-compiler.patch
index 3b4c9238dbc5..5cd5d455f7ac 100644
--- a/www-client/chromium/files/chromium-113-compiler.patch
+++ b/www-client/chromium/files/chromium-113-compiler.patch
@@ -10,7 +10,35 @@
      ":compiler_codegen",
      ":compiler_deterministic",
    ]
-@@ -1707,7 +1705,7 @@
+@@ -1397,27 +1395,6 @@
+   }
+ }
+ 
+-config("clang_revision") {
+-  if (is_clang && clang_base_path == default_clang_base_path) {
+-    update_args = [
+-      "--print-revision",
+-      "--verify-version=$clang_version",
+-    ]
+-    if (llvm_force_head_revision) {
+-      update_args += [ "--llvm-force-head-revision" ]
+-    }
+-    clang_revision = exec_script("//tools/clang/scripts/update.py",
+-                                 update_args,
+-                                 "trim string")
+-
+-    # This is here so that all files get recompiled after a clang roll and
+-    # when turning clang on or off. (defines are passed via the command line,
+-    # and build system rebuild things when their commandline changes). Nothing
+-    # should ever read this define.
+-    defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ]
+-  }
+-}
+-
+ config("rustc_revision") {
+   if (rustc_revision != "") {
+     # Similar to the above config, this is here so that all files get recompiled
+@@ -1707,7 +1684,7 @@
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -19,7 +47,7 @@
      if (treat_warnings_as_errors) {
        cflags += [ "-Werror" ]
  
-@@ -1716,10 +1714,6 @@
+@@ -1716,10 +1693,6 @@
        # well.
        ldflags = [ "-Werror" ]
      }
@@ -30,7 +58,7 @@
  
      if (treat_warnings_as_errors) {
        # Turn rustc warnings into the "deny" lint level, which produce compiler
-@@ -1737,16 +1731,6 @@
+@@ -1737,16 +1710,6 @@
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -47,7 +75,7 @@
      if (is_mac) {
        cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
        cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2111,7 +2095,8 @@
+@@ -2111,7 +2074,8 @@
  }
  
  # Default "optimization on" config.
@@ -57,7 +85,7 @@
    if (is_win) {
      if (chrome_pgo_phase != 2) {
        # Favor size over speed, /O1 must be before the common flags.
-@@ -2170,7 +2155,8 @@
+@@ -2170,7 +2134,8 @@
  }
  
  # Turn off optimizations.
@@ -67,7 +95,7 @@
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2210,7 +2196,8 @@
+@@ -2210,7 +2175,8 @@
  # Turns up the optimization level. On Windows, this implies whole program
  # optimization and link-time code generation which is very expensive and should
  # be used sparingly.
@@ -77,7 +105,7 @@
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2243,7 +2230,8 @@
+@@ -2243,7 +2209,8 @@
  #
  # TODO(crbug.com/621335) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -87,7 +115,7 @@
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2269,7 +2257,8 @@
+@@ -2269,7 +2236,8 @@
    }
  }
  
@@ -97,7 +125,7 @@
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2394,7 +2383,8 @@
+@@ -2394,7 +2362,8 @@
  }
  
  # Full symbols.
@@ -107,7 +135,7 @@
    if (is_win) {
      if (is_clang) {
        cflags = [
-@@ -2534,7 +2524,8 @@
+@@ -2534,7 +2503,8 @@
  # Minimal symbols.
  # This config guarantees to hold symbol for stack trace which are shown to user
  # when crash happens in unittests running on buildbot.
@@ -117,7 +145,7 @@
    if (is_win) {
      # Functions, files, and line tables only.
      cflags = []
-@@ -2608,7 +2599,8 @@
+@@ -2608,7 +2578,8 @@
  # This configuration contains function names only. That is, the compiler is
  # told to not generate debug information and the linker then just puts function
  # names in the final debug information.