more weird stuff

1 files changed, 27 insertions, 17 deletions

diff --git a/www-client/chromium/files/chromium-142-compiler.patch b/www-client/chromium/files/chromium-142-compiler.patch
index 8b9b331..ba45a89 100644
--- a/www-client/chromium/files/chromium-142-compiler.patch
+++ b/www-client/chromium/files/chromium-142-compiler.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 9cf9079bc5..fe08327b93 100644
+index 9cf9079bc5..2e4c762503 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -261,15 +261,6 @@ declare_args() {
@@ -316,17 +316,27 @@ index 9cf9079bc5..fe08327b93 100644
  config("compiler_arm_fpu") {
    if (current_cpu == "arm" && !is_ios) {
      cflags = [ "-mfpu=$arm_fpu" ]
-@@ -1866,7 +1629,8 @@ config("compiler_arm") {
-   }
+@@ -1867,6 +1630,19 @@ config("compiler_arm") {
  }
  
--config("libcxx_module") {
-+config("libcxx_module") {}
+ config("libcxx_module") {
++  cflags_cc = [
++    # TODO(crbug.com/1456385): Figure out if this can be removed.
++    "-Wno-modules-ambiguous-internal-linkage",
++
++    # TODO(crbug.com/40440396): Clean up.
++    "-Wno-modules-import-nested-redundant",
++
++    # Needed to allow using builtin modules when the headers are
++    # unnecessarily using extern "C".
++    "-Wno-module-import-in-extern-c",
++  ]
++}
 +config("libcxx_modulex") {
    if (use_clang_modules) {
      cflags_cc = [
        "-fmodules",
-@@ -2163,18 +1927,6 @@ config("default_warnings") {
+@@ -2163,18 +1939,6 @@ config("default_warnings") {
        ]
      }
  
@@ -345,7 +355,7 @@ index 9cf9079bc5..fe08327b93 100644
      if (is_wasm) {
        # Abseil's `symbolize_emscripten.inc` file currently has macros that are
        # not compatible with C++98, so turn off the warnings.
-@@ -2206,14 +1958,6 @@ config("default_warnings") {
+@@ -2206,14 +1970,6 @@ config("default_warnings") {
      if (cc_wrapper == "ccache" || cc_wrapper == "icecc") {
        cflags += [ "-Wno-gnu-line-marker" ]
      }
@@ -360,7 +370,7 @@ index 9cf9079bc5..fe08327b93 100644
    }
  
    # TODO(crbug.com/354162568): Clean up and enable.
-@@ -2286,11 +2030,7 @@ config("chromium_code") {
+@@ -2286,11 +2042,7 @@ config("chromium_code") {
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -373,7 +383,7 @@ index 9cf9079bc5..fe08327b93 100644
  
      # In Chromium code, we define __STDC_foo_MACROS in order to get the
      # C99 macros on Mac and Linux.
-@@ -2299,24 +2039,6 @@ config("chromium_code") {
+@@ -2299,24 +2051,6 @@ config("chromium_code") {
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -398,7 +408,7 @@ index 9cf9079bc5..fe08327b93 100644
      if (is_apple) {
        cflags_objc = [ "-Wimplicit-retain-self" ]
        cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2732,7 +2454,8 @@ config("default_stack_frames") {
+@@ -2732,7 +2466,8 @@ config("default_stack_frames") {
  # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
  # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
  # [2]: https://crrev.com/c/5447532
@@ -408,7 +418,7 @@ index 9cf9079bc5..fe08327b93 100644
    if (is_win) {
      # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
      # consistency with the other platforms.
-@@ -2781,7 +2504,8 @@ config("optimize") {
+@@ -2781,7 +2516,8 @@ config("optimize") {
  }
  
  # Turn off optimizations.
@@ -418,7 +428,7 @@ index 9cf9079bc5..fe08327b93 100644
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2816,7 +2540,8 @@ config("no_optimize") {
+@@ -2816,7 +2552,8 @@ config("no_optimize") {
  # Turns up the optimization level. Used to explicitly enable -O2 instead of
  # -Os for select targets on platforms that use optimize_for_size. No-op
  # elsewhere.
@@ -428,7 +438,7 @@ index 9cf9079bc5..fe08327b93 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2837,7 +2562,8 @@ config("optimize_max") {
+@@ -2837,7 +2574,8 @@ config("optimize_max") {
  #
  # TODO(crbug.com/41259697) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -438,7 +448,7 @@ index 9cf9079bc5..fe08327b93 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2854,7 +2580,8 @@ config("optimize_speed") {
+@@ -2854,7 +2592,8 @@ config("optimize_speed") {
    rustflags = [ "-Copt-level=3" ]
  }
  
@@ -448,7 +458,7 @@ index 9cf9079bc5..fe08327b93 100644
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2981,7 +2708,8 @@ config("win_pdbaltpath") {
+@@ -2981,7 +2720,8 @@ config("win_pdbaltpath") {
  }
  
  # Full symbols.
@@ -458,7 +468,7 @@ index 9cf9079bc5..fe08327b93 100644
    rustflags = []
    configs = []
    if (is_win) {
-@@ -3137,7 +2865,8 @@ config("symbols") {
+@@ -3137,7 +2877,8 @@ config("symbols") {
  # Minimal symbols.
  # This config guarantees to hold symbol for stack trace which are shown to user
  # when crash happens in unittests running on buildbot.
@@ -468,7 +478,7 @@ index 9cf9079bc5..fe08327b93 100644
    rustflags = []
    if (is_win) {
      # Functions, files, and line tables only.
-@@ -3213,7 +2942,8 @@ config("minimal_symbols") {
+@@ -3213,7 +2954,8 @@ config("minimal_symbols") {
  # 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.