diff options
Diffstat (limited to 'www-client/chromium/files')
| -rw-r--r-- | www-client/chromium/files/chromium-141-compiler.patch | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/www-client/chromium/files/chromium-141-compiler.patch b/www-client/chromium/files/chromium-141-compiler.patch index f384b4d..36f6f34 100644 --- a/www-client/chromium/files/chromium-141-compiler.patch +++ b/www-client/chromium/files/chromium-141-compiler.patch @@ -1,5 +1,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 298e37f832..b38f7d3844 100644 +index 298e37f832..c892801357 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -265,15 +265,6 @@ declare_args() { @@ -180,7 +180,7 @@ index 298e37f832..b38f7d3844 100644 # Tells the compiler not to use absolute paths when passing the default # paths to the tools it invokes. We don't want this because we don't # really need it and it can mess up the RBE cache entries. -@@ -1699,115 +1580,6 @@ config("compiler_deterministic") { +@@ -1699,114 +1580,8 @@ config("compiler_deterministic") { ldflags += [ "-no-canonical-prefixes" ] } } @@ -292,11 +292,12 @@ index 298e37f832..b38f7d3844 100644 - rebase_path(clang_warning_suppression_file, root_build_dir) - inputs = [ clang_warning_suppression_file ] - cflags = [ "--warning-suppression-mappings=" + from_build_root ] -- } ++ if (is_clang) { ++ cflags += [ "-Xclang", "-fno-cxx-modules" ] + } } - # Enable bounds checks when indexing directly (i.e. not via a pointer) -@@ -1833,18 +1605,6 @@ config("sanitize_c_array_bounds") { +@@ -1833,18 +1608,6 @@ config("sanitize_c_array_bounds") { } } @@ -315,7 +316,7 @@ index 298e37f832..b38f7d3844 100644 config("compiler_arm_fpu") { if (current_cpu == "arm" && !is_ios) { cflags = [ "-mfpu=$arm_fpu" ] -@@ -1869,7 +1629,8 @@ config("compiler_arm") { +@@ -1869,7 +1632,8 @@ config("compiler_arm") { } } @@ -325,7 +326,7 @@ index 298e37f832..b38f7d3844 100644 if (use_clang_modules) { cflags_cc = [ "-fmodules", -@@ -2288,11 +2049,7 @@ config("chromium_code") { +@@ -2288,11 +2052,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -338,7 +339,7 @@ index 298e37f832..b38f7d3844 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -2301,24 +2058,6 @@ config("chromium_code") { +@@ -2301,24 +2061,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -363,7 +364,7 @@ index 298e37f832..b38f7d3844 100644 if (is_apple) { cflags_objc = [ "-Wimplicit-retain-self" ] cflags_objcc = [ "-Wimplicit-retain-self" ] -@@ -2734,7 +2473,8 @@ config("default_stack_frames") { +@@ -2734,7 +2476,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 @@ -373,7 +374,7 @@ index 298e37f832..b38f7d3844 100644 if (is_win) { # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for # consistency with the other platforms. -@@ -2783,7 +2523,8 @@ config("optimize") { +@@ -2783,7 +2526,8 @@ config("optimize") { } # Turn off optimizations. @@ -383,7 +384,7 @@ index 298e37f832..b38f7d3844 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2818,7 +2559,8 @@ config("no_optimize") { +@@ -2818,7 +2562,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. @@ -393,7 +394,7 @@ index 298e37f832..b38f7d3844 100644 ldflags = common_optimize_on_ldflags if (is_win) { # Favor speed over size, /O2 must be before the common flags. -@@ -2839,7 +2581,8 @@ config("optimize_max") { +@@ -2839,7 +2584,8 @@ config("optimize_max") { # # TODO(crbug.com/41259697) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -403,7 +404,7 @@ index 298e37f832..b38f7d3844 100644 ldflags = common_optimize_on_ldflags if (is_win) { # Favor speed over size, /O2 must be before the common flags. -@@ -2856,7 +2599,8 @@ config("optimize_speed") { +@@ -2856,7 +2602,8 @@ config("optimize_speed") { rustflags = [ "-Copt-level=3" ] } @@ -413,7 +414,7 @@ index 298e37f832..b38f7d3844 100644 cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2983,7 +2727,8 @@ config("win_pdbaltpath") { +@@ -2983,7 +2730,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -423,7 +424,7 @@ index 298e37f832..b38f7d3844 100644 rustflags = [] configs = [] if (is_win) { -@@ -3139,7 +2884,8 @@ config("symbols") { +@@ -3139,7 +2887,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. @@ -433,7 +434,7 @@ index 298e37f832..b38f7d3844 100644 rustflags = [] if (is_win) { # Functions, files, and line tables only. -@@ -3215,7 +2961,8 @@ config("minimal_symbols") { +@@ -3215,7 +2964,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. |