diff options
| -rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-139-compiler-r1.patch | 54 |
2 files changed, 36 insertions, 20 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 40c66a1..216ccef 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -6,7 +6,7 @@ AUX chromium-126-freetype-blink.patch 532 BLAKE2B 68cebd58a1e00b2603c3aec90339d5 AUX chromium-131-use-oauth2-client-switches-as-default.patch 1194 BLAKE2B 040f8161c659d015bfda3f8f2f9c3f904b0b1318233569550c80b4c1a6cfeca8e3d39998e8ebec87880948ec2444214fd0551f0a65111363c3c40fe3c0d717c8 SHA512 20621cc7ee69bb0e53d1806f6e78381357fb31c99d339ed9b385a669dcdc92b800f2b3c2d6833bb36e94348793afe790a6f3f3d5d2f330c57407305fa8095a5a AUX chromium-134-EnumTable-crash.patch 3068 BLAKE2B 8b3bad8e20d6c3477495792279b1c58aa599e5934380d6efb26285a4348be8b98fe5869dc9ce9c83049e35f20f73ab9de7eb819002e6753aecd16ef7de734194 SHA512 5cd2da1407d150218595b3da7e76a2df7e12675e91c9bc2dce793f3801ed53705dada351865ead578ad6516ee5d19423f25021ab213bd9305eea8860f92f42b0 AUX chromium-138-gn-exec_script_allowlist.patch 1828 BLAKE2B 9717369b1e89321d06c94757bab5e281b06d8f711f418c33cf68d1d6c2027b2743bd92d1aee97747546030902359766352fa06793b45485b5a1ba30fb7898436 SHA512 dc117e296daa8a02252450078c5aa25cb8dd447a61fe06b2f430708c69f8e429be99ba808f36464e57f8be0b5855be4c83d9e576a9e2d4282fc8bce213787b2d -AUX chromium-139-compiler-r1.patch 17063 BLAKE2B 0cbce2b80950fee0cae0ca7e6574340cd5e41cd17dcb6c55699188c9efb6753b58eaf3f74417d01cc7c4756ff261eb2779c749fed25cf9172c1cb8500d05e492 SHA512 708a91019b281c3a068378eac77eb16dce1aaeeba85ee6323b886b666d5f246e204621d36e4c429204f2654c32b887015984d21459dfacd0115fc396165ddd37 +AUX chromium-139-compiler-r1.patch 17928 BLAKE2B 6a4e3b57ad55b65e50c361b0dff4111c6a3fbffdf2b9b8d9799f537197ed7b2f718641b67d483f7a1284e032d99a290a31d238dcce619efa4dba432239be28c5 SHA512 5e8293f75bfa6d3445b9084a85cd19e6b41bf1f1bc47bd2d5559eb5d85d14709a0f3fafea7d9a6fec3c87af0c596161621e451a529572f912d16537d6925113e AUX chromium-139-compiler.patch 17165 BLAKE2B b9ffbe4bb34d21819ea0ff3f2447e9e9ea56b93745d6e85e1e924d5fd05b7675bc9ef97be7f37c87049a892a6a82a5ae8daf51aa99332fe3e88fb1265b5f288e SHA512 0ef18d5a6856a96966b44085cf983c5e657533e21940ed830c5bf338908f2d495fab10d0c633c8f1a5017293e0bb5ca1ffcaaa3e6f16a5b5c4eaf849ab9af786 AUX chromium-139-mv2-ungoogled-r1.patch 7358 BLAKE2B 5f48c890e4fe1c22071ee9e4275203318b90143d9e4996688409f7df0232b3dc3dde7ef1a9c55ef75ac83c2aa411ed687321ac54da466f6b2c70b34fa6bcfd92 SHA512 d30c4b341774c2afa95ca466d879ccad38ee599476b56f30a5fdbfcd014c8ef463cc38a032af344e0d93cd958468305de24b9ec7ca49834be598bf92578b80a2 AUX chromium-139-mv2-ungoogled.patch 7365 BLAKE2B bec1adf79214352df32e2e7dc2ba27b773e840f8d8ef70d79096b3bf5822f5116591dae436bcb8caaf0ea3669004a9638719ec4947a704d536df3b83af05da21 SHA512 857f2ad5b4f0b9ede6018142fbced266fb09065f35f1609e66f6da0e128d40917f242923516c048d9341debdb02ef4acee33181eefcb51e797aa0754f1c94821 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. |