move toolchain_supports_rust_thin_lto patch to backports

Author: MaxIhlenfeldt

meta-chromium/recipes-browser/chromium/chromium-gn.inc

@@ -20,6 +20,7 @@ SRC_URI += "\
     file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
     file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
     file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
+    file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
 "
 # Non-specific patches.
 SRC_URI += "\
@@ -47,7 +48,6 @@ SRC_URI += "\
     file://0022-Use-base-ranges-instead-of-std-ranges.patch \
     file://0023-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
     file://0024-Adjust-the-Rust-build-to-our-needs.patch \
-    file://0025-Make-toolchain_supports_rust_thin_lto-configurable.patch \
 "
 # ARM/AArch64-specific patches.
 SRC_URI:append:arm = "\

meta-chromium/recipes-browser/chromium/files/0025-Make-toolchain_supports_rust_thin_lto-configurable.patch renamed to meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch

@@ -1,15 +1,12 @@
 From d5a13b62ce90ebc1490e8546a8caef664e727dd7 Mon Sep 17 00:00:00 2001
 From: Max Ihlenfeldt <[email protected]>
 Date: Thu, 18 Jan 2024 17:25:32 +0000
-Subject: [PATCH] Make toolchain_supports_rust_thin_lto configurable
+Subject: [PATCH] Backport "Make toolchain_supports_rust_thin_lto configurable"
 
-This makes toolchain_supports_rust_thin_lto a configurable GN arg, and
-also always passes `-Cembed-bitcode=no` to rustc if it is true.
+This backports a patch needed to make our Rust build setup work. It will
+be included in upstream's 123 release.
 
-This is useful when using an external Rust toolchain with a different
-LLVM version than clang.
-
-Upstream-Status: Pending
+Upstream-Status: Backport [https://crrev.com/c/5233602]
 Signed-off-by: Max Ihlenfeldt <[email protected]>
 ---
  build/config/compiler/BUILD.gn |  2 +-