diff options
Diffstat (limited to 'www-client/chromium/files/chromium-139-compiler-r1.patch')
| -rw-r--r-- | www-client/chromium/files/chromium-139-compiler-r1.patch | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/www-client/chromium/files/chromium-139-compiler-r1.patch b/www-client/chromium/files/chromium-139-compiler-r1.patch index e6d3025..4a1e8fe 100644 --- a/www-client/chromium/files/chromium-139-compiler-r1.patch +++ b/www-client/chromium/files/chromium-139-compiler-r1.patch @@ -1,9 +1,25 @@ -a94140ccbd compiler diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 0c04c90368..37f3828f09 100644 +index 0c04c90368..6cebd33c44 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -320,12 +320,8 @@ config("compiler") { +@@ -241,16 +241,6 @@ declare_args() { + assert(!(llvm_force_head_revision && use_remoteexec && host_os != "linux"), + "rbe with locally built clang only works on linux") + +-# Whether or not we should pass the warning_suppression.txt file to clang +-# compilations. This file allows us to suppress warnings that originate from +-# specific file paths, typically third_party headers. +-# +-# Since this is referenced both when passing the file and when deciding which +-# warnings to enable, store it in a separate variable here. +-use_clang_warning_suppression_file = +- !is_nacl && default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline && is_clang && clang_warning_suppression_file != "" +- + # default_include_dirs --------------------------------------------------------- + # + # This is a separate config so that third_party code (which would not use the +@@ -320,12 +310,8 @@ config("compiler") { configs += [ # See the definitions below. @@ -16,7 +32,7 @@ index 0c04c90368..37f3828f09 100644 ] # TODO(https://crbug.com/404297941): Disable clang_warning_suppression -@@ -515,6 +511,9 @@ config("compiler") { +@@ -515,6 +501,9 @@ config("compiler") { ldflags += [ "-fPIC" ] rustflags += [ "-Crelocation-model=pic" ] @@ -26,7 +42,7 @@ index 0c04c90368..37f3828f09 100644 if (!is_clang) { # Use pipes for communicating between sub-processes. Faster. # (This flag doesn't do anything with Clang.) -@@ -602,63 +601,6 @@ config("compiler") { +@@ -602,63 +591,6 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -90,7 +106,7 @@ index 0c04c90368..37f3828f09 100644 # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || -@@ -1083,20 +1025,6 @@ config("compiler") { +@@ -1083,20 +1015,6 @@ config("compiler") { # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", @@ -111,7 +127,7 @@ index 0c04c90368..37f3828f09 100644 ] if (!is_win || force_rustc_color_output) { -@@ -1151,7 +1079,7 @@ config("compiler") { +@@ -1151,7 +1069,7 @@ config("compiler") { # Don't allow unstable features to be enabled by `#![feature()]` without # additional command line flags. config("disallow_unstable_features") { @@ -120,7 +136,7 @@ index 0c04c90368..37f3828f09 100644 } config("libcxx_hardening") { -@@ -1631,52 +1559,6 @@ config("compiler_deterministic") { +@@ -1631,52 +1549,6 @@ config("compiler_deterministic") { } } @@ -173,7 +189,7 @@ index 0c04c90368..37f3828f09 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. -@@ -1703,119 +1585,6 @@ config("compiler_deterministic") { +@@ -1703,119 +1575,6 @@ config("compiler_deterministic") { } } @@ -293,7 +309,7 @@ index 0c04c90368..37f3828f09 100644 config("compiler_arm_fpu") { if (current_cpu == "arm" && !is_ios && !is_nacl) { cflags = [ "-mfpu=$arm_fpu" ] -@@ -2279,11 +2048,7 @@ config("chromium_code") { +@@ -2279,11 +2038,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -306,7 +322,7 @@ index 0c04c90368..37f3828f09 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -2292,24 +2057,6 @@ config("chromium_code") { +@@ -2292,24 +2047,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -331,7 +347,7 @@ index 0c04c90368..37f3828f09 100644 if (is_apple) { cflags_objc = [ "-Wimplicit-retain-self" ] cflags_objcc = [ "-Wimplicit-retain-self" ] -@@ -2734,7 +2481,8 @@ config("default_stack_frames") { +@@ -2734,7 +2471,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 @@ -341,7 +357,7 @@ index 0c04c90368..37f3828f09 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 +2531,8 @@ config("optimize") { +@@ -2783,7 +2521,8 @@ config("optimize") { } # Turn off optimizations. @@ -351,7 +367,7 @@ index 0c04c90368..37f3828f09 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2818,7 +2567,8 @@ config("no_optimize") { +@@ -2818,7 +2557,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. @@ -361,7 +377,7 @@ index 0c04c90368..37f3828f09 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2851,7 +2601,8 @@ config("optimize_max") { +@@ -2851,7 +2591,8 @@ config("optimize_max") { # # TODO(crbug.com/41259697) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -371,7 +387,7 @@ index 0c04c90368..37f3828f09 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2880,7 +2631,8 @@ config("optimize_speed") { +@@ -2880,7 +2621,8 @@ config("optimize_speed") { } } @@ -381,7 +397,7 @@ index 0c04c90368..37f3828f09 100644 cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -3011,7 +2763,8 @@ config("win_pdbaltpath") { +@@ -3011,7 +2753,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -391,7 +407,7 @@ index 0c04c90368..37f3828f09 100644 rustflags = [] configs = [] if (is_win) { -@@ -3185,7 +2938,8 @@ config("symbols") { +@@ -3185,7 +2928,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. @@ -401,7 +417,7 @@ index 0c04c90368..37f3828f09 100644 rustflags = [] if (is_win) { # Functions, files, and line tables only. -@@ -3270,7 +3024,8 @@ config("minimal_symbols") { +@@ -3270,7 +3014,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. |