diff options
author | 2025-05-16 22:55:04 -0400 | |
---|---|---|
committer | 2025-05-16 22:55:04 -0400 | |
commit | 73c4192372383f2803dd69e174b65328a7ca9f4e (patch) | |
tree | 64669b2f74ac0cde7f6a504d3f421e89e743c13e /www-client/chromium | |
parent | f49563b9f496ce04ba7fafdf6cecd4a9b82a2d19 (diff) | |
download | ppo-73c4192372383f2803dd69e174b65328a7ca9f4e.tar.xz |
chromium 138.0.7180.2?
Diffstat (limited to 'www-client/chromium')
-rw-r--r-- | www-client/chromium/Manifest | 5 | ||||
-rw-r--r-- | www-client/chromium/chromium-138.0.7180.2.ebuild (renamed from www-client/chromium/chromium-137.0.7141.3.ebuild) | 8 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-138-compiler-r1.patch | 448 |
3 files changed, 455 insertions, 6 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d1b262c..1f8b0ec 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -35,6 +35,7 @@ AUX chromium-137-gn-exec_script_allowlist.patch 2328 BLAKE2B 6b575d1886f839c27eb AUX chromium-137-mv2-ungoogled-r1.patch 8715 BLAKE2B eabfeccb1b3536d1500d2ea0f5628727be85a4a4a9452a2f18ef52d34668e3f4b3b6c2964b8b60f2e06f6c0560fc1873eb326ecb86146796a9a05bc40bdc3f46 SHA512 4bce5dd230d25c76530f71b0440341cf7edf3802ffac90f1ffd7380718c261da805853a6f930e91fc11ad64c07d1f407ab55c6cbbe6bb3b7422d7a9c46a545c4 AUX chromium-137-mv2-ungoogled.patch 8708 BLAKE2B a7c664c5b5789aa87a02b135a54365c28b4e23fa3299a8375e4d7d94b4414d6a5e4884d86df4f425efbbfe70f7ecdfbdd8937b12e9bc85e52b425b6e0a1d2ceb SHA512 427f9af6ffba70aab476389159672a0b19e328b1b67f38237ac4f13514b493741e07a3db830cdc90ea46ce355fcd9e1117bf45edc5c6214adc8d4b0b503056d1 AUX chromium-137-pdfium-png-decoder-fieldname.patch 862 BLAKE2B a1cb42d7fc6e39bde7e6685533f3074731ba28439faaf9e6457b72b3ffa387274f0f4351bf006081ebfbf574353c2036b9a6467f509707d1a122fea9a540529c SHA512 e9419b1f5caf539c5bf54ec55c3a07edc3eaed0d71140b4f23a168602695902c8b8a6405de8052721ad11a2def4dca74252e9265da531eb9e5b71465c3cd8d79 +AUX chromium-138-compiler-r1.patch 17460 BLAKE2B f8de0c95a9ac6d30d68ce4ef4959f59e4ea2c60de4ba661ca543f2170529ea733026d9a82f54fb0e8214463a92a6c967c2793a8f683d1fae5565f62b9451ef98 SHA512 032d9b7a2e097e69e5e48638c61adb2029981e90181f9b922a615fbf062f4d036f10527acb4ce7e70dff7c893524313420eb189a046fd87c21c0b07a47bfa258 AUX chromium-138-compiler.patch 17184 BLAKE2B 0b0202513d87aa2883611993afcb23cdc57715cf023328c7b2a89cffb394932fe6973984729efc0d74d08ab74c90cd0e6fa0a432ef0f9cf802aeda7a375a9cb9 SHA512 ae0783097a9658180c8ae70fec2fdf8ac9f497e98014b35a473a8b2ceb6e702a2794916539f13033cb544b34b07bf2307d66f08d6a6bbac90c3024a118eb18fc AUX chromium-138-gn-exec_script_allowlist.patch 1828 BLAKE2B 9717369b1e89321d06c94757bab5e281b06d8f711f418c33cf68d1d6c2027b2743bd92d1aee97747546030902359766352fa06793b45485b5a1ba30fb7898436 SHA512 dc117e296daa8a02252450078c5aa25cb8dd447a61fe06b2f430708c69f8e429be99ba808f36464e57f8be0b5855be4c83d9e576a9e2d4282fc8bce213787b2d AUX chromium-138-mv2-ungoogled.patch 7303 BLAKE2B 089429a5749d8a3cb071fbe48a35f6a709cf75465a6a3dbd2e72203af71bca8bfc4d3d81b441640089e50d7a0208de579fff32ea937b9cab7e0d6aafc92d57b1 SHA512 1721744dab5827ce9482faceed4eec40a198253e34250d3f3fc994bd287d096450585dd9712f1e4347e591c4873de10d6e6c53c225a2ca21c9c2c47f92820f3f @@ -44,8 +45,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-137.0.7141.3.tar.xz 7162471108 BLAKE2B da7a7c414034eb8335d76591c64d12bd09d8b50e2a5c6f6cccffe0b0f749bcb0aacbc247855969e41763558064266abaf37c794ea9c5c0df84c8a422eb1c8f9a SHA512 1594b1197d134e14f99c0c9a8dcc17ea29f9dce00a7858cfb62f54d13a9994f95e3d2b0ee6776213dbdff164fabe9fa8e4abe620036c048a9653b3ef8a1d052f DIST chromium-138.0.7166.2.tar.xz 7094031476 BLAKE2B 85e5e92175618bc6d21691e1493971dedc0d765d92ad3cdfafc0cc7f65c4b25d39f0016ffd7fcee64bf417919ae79238b7994a7069269ec4bccf4c73fb5e4874 SHA512 ea2ec10ad536056019b4d9f94393feb46f39a4890d7ed20be2d83db75421090056986b1885c288b02300fa3137cd3bb1e6960790aec0dd4eaf70d186fda9780a +DIST chromium-138.0.7180.2.tar.xz 7260009848 BLAKE2B 5f3349980aeb8a188f02c27bcc904d79ab378baf0bdca3de3d93be3d3f0d11b56e0b0376b80c526a6c768f7bc966147d00a76dbe2576d2f3036f9472c75f39b2 SHA512 fef69173583b49ab63e43af51f3065e702a6e3da24c424321470f73aa4df6afdaa0a9bb90ca38e556cf4dbe9ca13f37d60918b26bb60446104aeda4e5bb2b42b DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c -EBUILD chromium-137.0.7141.3.ebuild 40646 BLAKE2B 2d013ab5664af5a03dfad65e9a910ef7ff6e17bd2cf3df4ab002e9a24f695377817cec303d967f5a4a28ca85b75437fea20ace469cc4b72eafdb624aafe86827 SHA512 c16c3630fdac558008f93dc1e1f024f72487e508d1b498f9dde4d4843608605f68fe79528f35575362dc508f3848df463be4ac1677be26b1af263f093d99b48d EBUILD chromium-138.0.7166.2.ebuild 40622 BLAKE2B ad6f5a125339d60837d41b83b2a3511fdc222f6f3b4ac528369e0f86b61cfc923770400478c77d9caabd7f1b3b0e9fa97a72aa18c39bbc0c00eacdaa610c3263 SHA512 248b3ad3938faa78e8edf22a699aee8b191503d45ddeedfdfac2f603db5eae2c24f0bc94d3312b376cc9c011a952e1ab293271f413e868bc1ad4bc25576e7904 +EBUILD chromium-138.0.7180.2.ebuild 40625 BLAKE2B 6d0f033c1c7fcc74131155e2817079699591b2b137b9266d47cc0388999919610b642332852b4ebadb23275887234c5cdb0b6be320e312cd63a2220c7e38dcda SHA512 1eaecdf4cf51d6bd7338b2a4311470c05c7e7b5fe2ca4c576711e93fc3686598268e23b3aebac4f427d2d468d502b33e2c0a3cc026180eea9f1287d7b0906f72 diff --git a/www-client/chromium/chromium-137.0.7141.3.ebuild b/www-client/chromium/chromium-138.0.7180.2.ebuild index 11801ec..f988d8e 100644 --- a/www-client/chromium/chromium-137.0.7141.3.ebuild +++ b/www-client/chromium/chromium-138.0.7180.2.ebuild @@ -316,14 +316,14 @@ src_prepare() { local PATCHES=( "${FILESDIR}/chromium-135-protobuf-RepeatedPtrField-export.patch" - "${FILESDIR}/chromium-137-compiler-r1.patch" + "${FILESDIR}/chromium-138-compiler-r1.patch" "${FILESDIR}/chromium-119-minizip.patch" "${FILESDIR}/chromium-118-material-color-utils.patch" "${FILESDIR}/chromium-126-freetype-blink.patch" "${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch" - "${FILESDIR}/chromium-137-gn-exec_script_allowlist.patch" + "${FILESDIR}/chromium-138-gn-exec_script_allowlist.patch" "${FILESDIR}/chromium-137-pdfium-png-decoder-fieldname.patch" - "${FILESDIR}/chromium-137-mv2-ungoogled-r1.patch" + "${FILESDIR}/chromium-138-mv2-ungoogled.patch" "${FILESDIR}/chromium-111-InkDropHost-crash.patch" "${FILESDIR}/chromium-134-EnumTable-crash.patch" @@ -443,8 +443,8 @@ src_prepare() { third_party/devtools-frontend/src/front_end/third_party/wasmparser third_party/devtools-frontend/src/front_end/third_party/web-vitals third_party/devtools-frontend/src/third_party - third_party/distributed_point_functions third_party/dom_distiller_js + third_party/dragonbox third_party/eigen3 third_party/emoji-segmenter third_party/fast_float diff --git a/www-client/chromium/files/chromium-138-compiler-r1.patch b/www-client/chromium/files/chromium-138-compiler-r1.patch new file mode 100644 index 0000000..d55407c --- /dev/null +++ b/www-client/chromium/files/chromium-138-compiler-r1.patch @@ -0,0 +1,448 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 94fc4b4c09..4d767bb404 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -310,12 +310,8 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", +- ":rustc_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ":compiler_deterministic", +- ":clang_warning_suppression", + ] + + # Here we enable -fno-delete-null-pointer-checks, which makes various nullptr +@@ -495,6 +491,9 @@ config("compiler") { + ldflags += [ "-fPIC" ] + rustflags += [ "-Crelocation-model=pic" ] + ++ extra_rustflags = getenv("RUSTFLAGS") ++ rustflags += [ extra_rustflags ] ++ + if (!is_clang) { + # Use pipes for communicating between sub-processes. Faster. + # (This flag doesn't do anything with Clang.) +@@ -571,70 +570,6 @@ config("compiler") { + ldflags += [ "-Wl,-z,keep-text-section-prefix" ] + } + +- if (is_clang && !is_nacl) { +- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] +- if (save_reproducers_on_lld_crash && use_lld) { +- ldflags += [ +- "-fcrash-diagnostics=all", +- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir, +- ] +- } +- +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- cflags += [ +- "-mllvm", +- "-instcombine-lower-dbg-declare=0", +- ] +- if (!is_debug && use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ] +- } +- } +- +- # TODO(crbug.com/40283598): This causes binary size growth and potentially +- # other problems. +- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. +- if (default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline) { +- cflags += [ +- "-mllvm", +- "-split-threshold-for-reg-with-hint=0", +- ] +- if (use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] +- } +- } +- } +- +- # TODO(crbug.com/40192287): Investigate why/if this should be needed. +- if (is_win) { +- cflags += [ "/clang:-ffp-contract=off" ] +- } else { +- cflags += [ "-ffp-contract=off" ] +- } +- +- # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF +- # (excluding toolchains that use an older version of LLVM). +- # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds. +- if (is_linux && use_lld && !llvm_android_mainline && current_cpu != "arm" && +- default_toolchain != "//build/toolchain/cros:target") { +- cflags += [ "-Wa,--crel,--allow-experimental-crel" ] +- } +- +- # TODO(crbug.com/413427035): Remove once +- # https://github.com/llvm/llvm-project/pull/136867/ is landed. +- if (!is_win && !llvm_android_mainline && +- default_toolchain != "//build/toolchain/cros:target") { +- cflags += [ "-fextend-variable-liveness=none" ] +- } +- } +- + # C11/C++11 compiler flags setup. + # --------------------------- + if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || +@@ -1045,20 +980,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", +- +- # To make Rust .d files compatible with ninja +- "-Zdep-info-omit-d-target", +- +- # If a macro panics during compilation, show which macro and where it is +- # defined. +- "-Zmacro-backtrace", +- +- # For deterministic builds, keep the local machine's current working +- # directory from appearing in build outputs. +- "-Zremap-cwd-prefix=.", +- +- # We use clang-rt sanitizer runtimes. +- "-Zexternal-clangrt", + ] + + if (!is_win || force_rustc_color_output) { +@@ -1113,7 +1034,7 @@ config("compiler") { + # Don't allow unstable features to be enabled by `#![feature()]` without + # additional command line flags. + config("disallow_unstable_features") { +- rustflags = [ "-Zallow-features=" ] ++ #rustflags = [ "-Zallow-features=" ] + } + + config("libcxx_hardening") { +@@ -1593,52 +1514,6 @@ config("compiler_deterministic") { + } + } + +- # Makes builds independent of absolute file path. +- if (is_clang && strip_absolute_paths_from_debug_symbols) { +- # If debug option is given, clang includes $cwd in debug info by default. +- # For such build, this flag generates reproducible obj files even we use +- # different build directory like "out/feature_a" and "out/feature_b" if +- # we build same files with same compile flag. +- # Other paths are already given in relative, no need to normalize them. +- if (is_nacl) { +- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] +- } else { +- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= +- # and -fcoverage-compilation-dir=. +- cflags += [ "-ffile-compilation-dir=." ] +- +- # Convert absolute paths to relative paths. Expands to, for example: +- # -file-prefix-map /path/to/chromium/src=../.. +- swiftflags += [ +- "-file-prefix-map", +- rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir), +- ] +- } +- if (!is_win) { +- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) +- asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +- } +- +- if (is_win && use_lld) { +- if (symbol_level == 2 || (is_clang && using_sanitizer)) { +- # Absolutize source file paths for PDB. Pass the real build directory +- # if the pdb contains source-level debug information and if linker +- # reproducibility is not critical. +- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ] +- } else { +- # Use a fake fixed base directory for paths in the pdb to make the pdb +- # output fully deterministic and independent of the build directory. +- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ] +- } +- } +- } +- + # 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. +@@ -1657,121 +1532,6 @@ config("compiler_deterministic") { + } + } + +-config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path && +- current_os != "zos") { +- _perform_consistency_checks = current_toolchain == default_toolchain +- if (llvm_force_head_revision) { +- _head_revision_stamp_path = "//third_party/llvm-build/force_head_revision" +- _head_revision = "" +- if (path_exists(_head_revision_stamp_path)) { +- _head_revision = read_file(_head_revision_stamp_path, "trim string") +- } +- assert( +- _head_revision != "", +- "llvm_force_head_revision=true, but no locally built version was detected.") +- _clang_revision = _head_revision +- } else { +- _clang_revision = read_file( +- "//third_party/llvm-build/Release+Asserts/cr_build_revision", +- "trim string") +- +- # Ensure that the synced clang version matches what's in git. +- if (_perform_consistency_checks) { +- # Parse the clang version from the Python script. +- _clang_version_lines = filter_include( +- read_file("//tools/clang/scripts/update.py", "list lines"), +- [ "CLANG_*REVISION = *" ]) +- _py_revision = +- string_replace(_clang_version_lines[0], "CLANG_REVISION = '", "") +- _py_revision = string_replace(_py_revision, "'", "") +- _py_subrevision = +- string_replace(_clang_version_lines[1], "CLANG_SUB_REVISION = ", "") +- _expected_clang_revision = "$_py_revision-$_py_subrevision" +- +- # TODO(agrieve): Change filter_include to _clang_revision == +- # _expected_clang_revision once angle & webrtc use a GCS DEPS entry +- # rather than a update.py runhook. +- assert( +- filter_include([ _clang_revision ], +- [ +- _expected_clang_revision, +- "$_expected_clang_revision,*", +- ]) != [], +- "clang_revision=\"$_clang_revision\" but update.py expected \"$_expected_clang_revision\". Did you forget to gclient sync?") +- } +- } +- +- if (_perform_consistency_checks) { +- # Ensure that the revision matches the version major expected by GN. +- _versions_match = filter_include([ _clang_revision ], +- [ "llvmorg-$clang_version-*" ]) != [] +- assert( +- _versions_match, +- "clang_revision=\"$_clang_revision\" but clang_version=\"$clang_version\". clang_version in build/toolchain/toolchain.gni is likely outdated.") +- } +- +- if (toolchain_has_rust && _perform_consistency_checks) { +- # Ensure that the synced rust version matches what's in git. +- _rust_revision_lines = +- filter_include(read_file("//tools/rust/update_rust.py", "list lines"), +- [ "RUST_*REVISION = *" ]) +- _py_revision = +- string_replace(_rust_revision_lines[0], "RUST_REVISION = '", "") +- _py_revision = string_replace(_py_revision, "'", "") +- _py_subrevision = +- string_replace(_rust_revision_lines[1], "RUST_SUB_REVISION = ", "") +- _expected_rust_revision = "$_py_revision-$_py_subrevision" +- +- # Ensure the rust version matches the clang version. +- assert( +- filter_include([ rustc_revision ], +- [ "*-$_expected_rust_revision-*" ]) != [], +- "rustc_revision=\"$rustc_revision\" but update_rust.py expected \"$_expected_rust_revision\". Run \"gclient sync\"?") +- } +- +- # 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\"" ] +- } +-} +- +-# Controls the usage of a warning suppression mapping (WSM) file to suppress +-# warnings based on the path of the file they come from. It's controlled by the +-# `clang_warning_suppression_file` gn argument , which points to a text file +-# defining which warnings should be suppressed where. +-# See //build/config/warning_suppression.txt for an example file; this is the +-# file used by Chromium. +-# +-# To use a different file, or to use this functionality outside of chromium, +-# set the `clang_warning_suppression_file` argument to point to the new file, +-# e.g. by setting in the the project's .gn file. +-config("clang_warning_suppression") { +- # Some build configs use older versions of clang that don't support WSMs +- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline && is_clang && +- clang_warning_suppression_file != "") { +- from_build_root = +- rebase_path(clang_warning_suppression_file, root_build_dir) +- inputs = [ clang_warning_suppression_file ] +- cflags = [ "--warning-suppression-mappings=" + from_build_root ] +- } +-} +- +-config("rustc_revision") { +- if (rustc_revision != "") { +- # Similar to the above config, this is here so that all files get recompiled +- # after a rustc roll. Nothing should ever read this cfg. This will not be +- # set if a custom toolchain is used. +- rustflags = [ +- "--cfg", +- "cr_rustc_revision=\"$rustc_revision\"", +- ] +- } +-} +- + config("compiler_arm_fpu") { + if (current_cpu == "arm" && !is_ios && !is_nacl) { + cflags = [ "-mfpu=$arm_fpu" ] +@@ -2207,11 +1967,7 @@ config("chromium_code") { + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] +- if (is_clang) { +- # Enable extra warnings for chromium_code when we control the compiler. +- cflags += [ "-Wextra" ] +- } ++ cflags = [ ] + + # In Chromium code, we define __STDC_foo_MACROS in order to get the + # C99 macros on Mac and Linux. +@@ -2220,24 +1976,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && +- current_cpu != "s390" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64" && +- current_cpu != "riscv64" && current_cpu != "loong64") { +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- fortify_level = "2" +- +- # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3 +- # implementation with a few custom glibc patches. Use that if it's +- # available. +- if (is_chromeos_device && !lacros_use_chromium_toolchain) { +- fortify_level = "3" +- } +- defines += [ "_FORTIFY_SOURCE=" + fortify_level ] +- } +- + if (is_apple) { + cflags_objc = [ "-Wimplicit-retain-self" ] + cflags_objcc = [ "-Wimplicit-retain-self" ] +@@ -2653,7 +2391,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 +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for + # consistency with the other platforms. +@@ -2702,7 +2441,8 @@ config("optimize") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2737,7 +2477,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. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2770,7 +2511,8 @@ config("optimize_max") { + # + # TODO(crbug.com/41259697) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2799,7 +2541,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + rustflags = [ "-Copt-level=1" ] + ldflags = common_optimize_on_ldflags +@@ -2930,7 +2673,8 @@ config("win_pdbaltpath") { + } + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + rustflags = [] + configs = [] + if (is_win) { +@@ -3092,7 +2836,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. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + rustflags = [] + if (is_win) { + # Functions, files, and line tables only. +@@ -3177,7 +2922,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. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (is_win) { + ldflags = [ "/DEBUG" ] + +diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn +index a659210b19..bde0e1b273 100644 +--- a/build/config/gcc/BUILD.gn ++++ b/build/config/gcc/BUILD.gn +@@ -32,7 +32,7 @@ declare_args() { + # See http://gcc.gnu.org/wiki/Visibility + config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] +- rustflags = [ "-Zdefault-visibility=hidden" ] ++ # rustflags = [ "-Zdefault-visibility=hidden" ] + + # Visibility attribute is not supported on AIX. + if (current_os != "aix") { +diff --git a/build/config/rust.gni b/build/config/rust.gni +index bd18d13119..6687b7cb2f 100644 +--- a/build/config/rust.gni ++++ b/build/config/rust.gni +@@ -77,7 +77,8 @@ declare_args() { + # + # TODO(crbug.com/40281834): Re-enable ThinLTO for Rust on LaCrOS + # TODO(b/300937673): Re-enable ThinLTO for Rust on ash-chrome +- toolchain_supports_rust_thin_lto = !is_chromeos ++ # toolchain_supports_rust_thin_lto = !is_chromeos ++ toolchain_supports_rust_thin_lto = false + + # Any extra std rlibs in your Rust toolchain, relative to the standard + # Rust toolchain. Typically used with 'rust_sysroot_absolute' |