more confusion

2 files changed, 16 insertions, 11 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d5e7335..225cd1f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -34,7 +34,7 @@ AUX chromium-121-qrgen-disablerust.patch 3295 BLAKE2B 6ba03f01ee7c14d7dff1c8d889
 AUX chromium-122-VirtualCursor-std-layout.patch 8472 BLAKE2B 872bd935eb702967dbbaf6045722f6f34b768ff607c6a53c42b92fd38dad6a8dc9d286f0e1f05ff30f03d402a04ee196f02d5fc977ea97b8ea1245c0aae1c428 SHA512 bdcaa80e36e0f9938b7e2f782baf1de8714cd1f5a032cdabbd885678ff2c77a98c69d4436cb01726e160bdb3ef4b10155f3a3b92b8b54a0726a25cc8c65b1393
 AUX chromium-122-qrgen-disablerust.patch 3378 BLAKE2B 34ac10a8f53f46cce4e77ad2b9d8e78113905be04a45965532ed8b6f5a0ee8348636a1f38970b3dcdeec6730d508b429db1f952da5a63979b0e11c175b97376d SHA512 6377ea12dae8caee1daab4c2ec29920e4211b3ebde1dbf3e2f1eb034aedc1ef97a7bfbe3723c869d8b39cad47848e40733bed2998e0e9bb3fd6912d71a203471
 AUX chromium-123-EnumTable-crash.patch 2978 BLAKE2B 44b18e702b82f4839a8a4cc639d1f91b6a4ed96fe266a4ee690c766361c36e7bce49e32455388eacd76ad408b72e6d458d9653a841b8483afa739df163621730 SHA512 5b56cb55aa1aef874963ce656ed610eddd0e09d6ab320f55ecac609c5ee26406c67295a96adcbcc6c2f4e1d86df46da0610c555a61c65215a486f448541fe136
-AUX chromium-123-compiler.patch 11106 BLAKE2B bc04a2f70a486ef79318a09af561121e7589428e412b2867a6840d41eb67dfe5b8d03cdb8ad42ef7e45de4b05725ed99853633ffefded69d19bb508fd8b18ac1 SHA512 43074329f1490e864ce617cb357d251d1a8cc22099af1ffdeab0b3ac357f6d6bbba14269eb6c6ab9d2d6ee459c6230283f8cb43c07c9fcc8c333c4f500c5a13e
+AUX chromium-123-compiler.patch 11238 BLAKE2B 2cd6a2dc550f952685db63062d7d90f688d29fb391b52646880c50d1884913a29e88f7e706a16b8a2954373f020d8488995dd9ced5c3a4aff044774a6b5a2320 SHA512 709ad3c413308a7e50ae95b433f52868c93a96682dacdeb82310e166af0b56afa7b98a1c0dfd147a34be0d9ba78c174ff547d95b429b4734aa3a11b736b3cf9f
 AUX chromium-123-qrgen-disablerust.patch 3371 BLAKE2B d4d8d37fc7c971f97467441c22bdf7dba1a22c17d73c47978b926565759b5b113c8a03a91d76cdb1e8f8d1fc3902c86bcc7ed703e84959927548cccfbc45836b SHA512 c3a5f6424806fc6528ee7eab83e13169218d82b18750298e916696a0d6fa288b1881e267a72a57cb03291fe642d7edf91d365e320587d40277ed9e7a860b497a
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
diff --git a/www-client/chromium/files/chromium-123-compiler.patch b/www-client/chromium/files/chromium-123-compiler.patch
index baf3deb..6faf9b7 100644
--- a/www-client/chromium/files/chromium-123-compiler.patch
+++ b/www-client/chromium/files/chromium-123-compiler.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index a91928eeac..ea3333c50c 100644
+index a91928eeac..afc87ad613 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -322,9 +322,6 @@ config("compiler") {
@@ -78,15 +78,6 @@ index a91928eeac..ea3333c50c 100644
    # C11/C++11 compiler flags setup.
    # ---------------------------
    if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -816,7 +767,7 @@ config("compiler") {
-     if (!is_android || current_cpu == "arm64") {
-       cflags += [ "-fwhole-program-vtables" ]
- 
--      if (toolchain_supports_rust_thin_lto) {
-+      if (toolchain_supports_rust_thin_lto && !toolchain_supports_rust_thin_lto) {
-         # whole-program-vtables implies -fsplit-lto-unit, and Rust needs to match
-         # behaviour. Rust needs to know the linker will be doing LTO in this case
-         # or it rejects the Zsplit-lto-unit flag.
 @@ -1013,17 +964,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.
@@ -310,3 +301,17 @@ index a91928eeac..ea3333c50c 100644
    if (is_win) {
      ldflags = [ "/DEBUG" ]
  
+diff --git a/build/config/rust.gni b/build/config/rust.gni
+index 9b0ee754ba..a438ed231c 100644
+--- a/build/config/rust.gni
++++ b/build/config/rust.gni
+@@ -75,7 +75,8 @@ declare_args() {
+   #
+   # TODO(https://crbug.com/1482525): 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'