lang/rust: Update to 1.85.0

Announce: https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html
ChangeLog: https://github.com/rust-lang/rust/releases/tag/1.85.0

PR:		284884
Tested by:	mikael,pkubaj

9 files changed, 69 insertions, 814 deletions

diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index b0e7ecd1a93e..e3d66469a325 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
 
 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.85.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 9f125d7e67d0..0610308068a3 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -77,7 +77,7 @@ ELF_FEATURES+=	+wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	rust-cbindgen>=0.26.0:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.84.0:lang/${RUST_DEFAULT} \
+				${RUST_DEFAULT}>=1.85.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index 6c9834589275..55100b7bc0a6 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -2,7 +2,7 @@
 # to upload them to ~/public_distfiles on freefall in preparation
 # for the next lang/rust update.
 PORTNAME=	rust
-PORTVERSION=	1.84.0
+PORTVERSION=	1.85.0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
index f3cf4d157851..ce117d264c94 100644
--- a/lang/rust-bootstrap/distinfo
+++ b/lang/rust-bootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736442015
-SHA256 (rust/rustc-1.84.0-src.tar.xz) = bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3
-SIZE (rust/rustc-1.84.0-src.tar.xz) = 354993944
+TIMESTAMP = 1739890892
+SHA256 (rust/rustc-1.85.0-src.tar.xz) = d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7
+SIZE (rust/rustc-1.85.0-src.tar.xz) = 274011696
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index d3bdf0e6d3ff..e6521112bd61 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rust
-PORTVERSION?=	1.84.0
+PORTVERSION?=	1.85.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
@@ -72,8 +72,8 @@ WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
 			_RUST_TARGETS+=wasm32-unknown-unknown
 
 # See WRKSRC/src/stage0 for the date and version values
-BOOTSTRAPS_DATE?=		2024-11-28
-RUST_BOOTSTRAP_VERSION?=	1.83.0
+BOOTSTRAPS_DATE?=		2025-01-09
+RUST_BOOTSTRAP_VERSION?=	1.84.0
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
 
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index dc00b2df17ef..f95cdd08b16b 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,51 +1,51 @@
-TIMESTAMP = 1736442014
-SHA256 (rust/rustc-1.84.0-src.tar.xz) = bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3
-SIZE (rust/rustc-1.84.0-src.tar.xz) = 354993944
-SHA256 (rust/2024-11-28/rustc-1.83.0-aarch64-unknown-freebsd.tar.xz) = 53625317b287426cc6c0b1a15c3480625e3ed5f3199229def81bcb8dfd511e73
-SIZE (rust/2024-11-28/rustc-1.83.0-aarch64-unknown-freebsd.tar.xz) = 59883804
-SHA256 (rust/2024-11-28/rust-std-1.83.0-aarch64-unknown-freebsd.tar.xz) = 5762a84851b4942eca8067759c62860e741b6d07bef5f1524bc9993f2c62f3e3
-SIZE (rust/2024-11-28/rust-std-1.83.0-aarch64-unknown-freebsd.tar.xz) = 26594288
-SHA256 (rust/2024-11-28/cargo-1.83.0-aarch64-unknown-freebsd.tar.xz) = 903cc3f68ac256491b9ca9057da93dee2ce7c687cd05c419ce5a3ec7d9151533
-SIZE (rust/2024-11-28/cargo-1.83.0-aarch64-unknown-freebsd.tar.xz) = 9379764
-SHA256 (rust/2024-11-28/rustc-1.83.0-x86_64-unknown-freebsd.tar.xz) = bcd20ce537bdfa0fa190200562fb3bf4314e8eebb896b6f2dd6f57bd8d50c391
-SIZE (rust/2024-11-28/rustc-1.83.0-x86_64-unknown-freebsd.tar.xz) = 49342052
-SHA256 (rust/2024-11-28/rust-std-1.83.0-x86_64-unknown-freebsd.tar.xz) = cd8ae7414b81ed3f7a90a10d2f5d1266bf6d19c70f88cdbc2b5cb96b3560954d
-SIZE (rust/2024-11-28/rust-std-1.83.0-x86_64-unknown-freebsd.tar.xz) = 28442576
-SHA256 (rust/2024-11-28/cargo-1.83.0-x86_64-unknown-freebsd.tar.xz) = 393e95a10de60ff8979b69a3228470e630980e49f189ef19fa7d15038afd81a9
-SIZE (rust/2024-11-28/cargo-1.83.0-x86_64-unknown-freebsd.tar.xz) = 10586716
-SHA256 (rust/2024-11-28/rustc-1.83.0-armv7-unknown-freebsd.tar.xz) = d05b0d45cc822284733accc251a03ddf6739f8d678819f0ced23fb0d925bdfd2
-SIZE (rust/2024-11-28/rustc-1.83.0-armv7-unknown-freebsd.tar.xz) = 60567988
-SHA256 (rust/2024-11-28/rust-std-1.83.0-armv7-unknown-freebsd.tar.xz) = ffc92e23bf8b132a50a994a7cd46664148cc1632ac646c301376bbe2cc56ac4c
-SIZE (rust/2024-11-28/rust-std-1.83.0-armv7-unknown-freebsd.tar.xz) = 26241532
-SHA256 (rust/2024-11-28/cargo-1.83.0-armv7-unknown-freebsd.tar.xz) = c42dc139fb9a3b3bd32c655ad6b30352b8eb25ee3ee9a8ba462cb512c6187903
-SIZE (rust/2024-11-28/cargo-1.83.0-armv7-unknown-freebsd.tar.xz) = 9553468
-SHA256 (rust/2024-11-28/rustc-1.83.0-i686-unknown-freebsd.tar.xz) = c90a73dfa93ff5567402f8bab30bc14e37a630284f63332feee6edfac6cecf1a
-SIZE (rust/2024-11-28/rustc-1.83.0-i686-unknown-freebsd.tar.xz) = 68616492
-SHA256 (rust/2024-11-28/rust-std-1.83.0-i686-unknown-freebsd.tar.xz) = 46fa7ef2ceae4bfc3274898eaf24877551ae225b276a87e832a8999b816a8dc7
-SIZE (rust/2024-11-28/rust-std-1.83.0-i686-unknown-freebsd.tar.xz) = 28074600
-SHA256 (rust/2024-11-28/cargo-1.83.0-i686-unknown-freebsd.tar.xz) = 9f3bde750b6c3787dd520dd246fb3c50e1496242f998598aefd138186675f7e4
-SIZE (rust/2024-11-28/cargo-1.83.0-i686-unknown-freebsd.tar.xz) = 11228084
-SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc-unknown-freebsd.tar.xz) = 2aaa361f7fee6d9755de47364eb53fec3486f7d9a5e916b50c003b38d7c37fc4
-SIZE (rust/2024-11-28/rustc-1.83.0-powerpc-unknown-freebsd.tar.xz) = 64724884
-SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc-unknown-freebsd.tar.xz) = 98112a1b24282a395cdf7d0e09f10a3c51464500af223c8b07c0ff53fe92f537
-SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc-unknown-freebsd.tar.xz) = 25370768
-SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc-unknown-freebsd.tar.xz) = 686d679977593a829e4280a0cb46de1212e2c62a6ad6a5c11486b8558d99a8dc
-SIZE (rust/2024-11-28/cargo-1.83.0-powerpc-unknown-freebsd.tar.xz) = 10115760
-SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 1cb1579ccbffe166555d435450563d3ee48d1f5efc87592a568b7795f1e67748
-SIZE (rust/2024-11-28/rustc-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 62769248
-SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 7d54fc02cf6f040a99b8e0d63bfc7be65818dca4cea1c674a0ebef8108808651
-SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 25375440
-SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 5ca797e83b71165ac679b06a7337a0bfba2ad8265c151d19c3754e155152df07
-SIZE (rust/2024-11-28/cargo-1.83.0-powerpc64-unknown-freebsd.tar.xz) = 9793476
-SHA256 (rust/2024-11-28/rustc-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = fa8cb467a256c6f2c73663185a65c539904b297933f821b5184d08a9385cab58
-SIZE (rust/2024-11-28/rustc-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 64271412
-SHA256 (rust/2024-11-28/rust-std-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 576c54a125e2b16e7374f39a66d5cdfd8fcf5d77b6c8f95def10cbdd8c46f5c6
-SIZE (rust/2024-11-28/rust-std-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 25495056
-SHA256 (rust/2024-11-28/cargo-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 9ebff9fb381075bbc2e121c99ac1e6c6b52df168d9b2bc7124ee7055e202e7b0
-SIZE (rust/2024-11-28/cargo-1.83.0-powerpc64le-unknown-freebsd.tar.xz) = 10021204
-SHA256 (rust/2024-11-28/rustc-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 3cce6f097a064a11e97f20953c8a25f31712132b94205145c30a4b6f5b7a86fc
-SIZE (rust/2024-11-28/rustc-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 69320848
-SHA256 (rust/2024-11-28/rust-std-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = d842e0d6677371954789991bc42875bc4ad02df80f362a2f643e62d521adb304
-SIZE (rust/2024-11-28/rust-std-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 25295428
-SHA256 (rust/2024-11-28/cargo-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 350afd6ce31fa76dda1693ae7de23106227cac4344c283a83725e5f3e5c3dd32
-SIZE (rust/2024-11-28/cargo-1.83.0-riscv64gc-unknown-freebsd.tar.xz) = 11818580
+TIMESTAMP = 1739890891
+SHA256 (rust/rustc-1.85.0-src.tar.xz) = d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7
+SIZE (rust/rustc-1.85.0-src.tar.xz) = 274011696
+SHA256 (rust/2025-01-09/rustc-1.84.0-aarch64-unknown-freebsd.tar.xz) = 5d146dbee6791d188826d20f602e55c3b49ae4ca822ecc5e45df41b8a34df962
+SIZE (rust/2025-01-09/rustc-1.84.0-aarch64-unknown-freebsd.tar.xz) = 64027760
+SHA256 (rust/2025-01-09/rust-std-1.84.0-aarch64-unknown-freebsd.tar.xz) = ceb22132c8845ec4ee937c8a390d9d6e21fc4099a7ea995d9563707213977ba8
+SIZE (rust/2025-01-09/rust-std-1.84.0-aarch64-unknown-freebsd.tar.xz) = 24359008
+SHA256 (rust/2025-01-09/cargo-1.84.0-aarch64-unknown-freebsd.tar.xz) = 7700325e0db2712b42ae61913c68e7c69ea9112aa666668a2b51f9c5854607d8
+SIZE (rust/2025-01-09/cargo-1.84.0-aarch64-unknown-freebsd.tar.xz) = 8276736
+SHA256 (rust/2025-01-09/rustc-1.84.0-x86_64-unknown-freebsd.tar.xz) = 40a0d9dc8d46aae81be8d5fbe7204a23d9c8744dfb76afbebe096982514fde80
+SIZE (rust/2025-01-09/rustc-1.84.0-x86_64-unknown-freebsd.tar.xz) = 59505104
+SHA256 (rust/2025-01-09/rust-std-1.84.0-x86_64-unknown-freebsd.tar.xz) = 2f9e270856ded31930289b8342df072e2af453b451a8e529bb37ff84e1c2c350
+SIZE (rust/2025-01-09/rust-std-1.84.0-x86_64-unknown-freebsd.tar.xz) = 25955632
+SHA256 (rust/2025-01-09/cargo-1.84.0-x86_64-unknown-freebsd.tar.xz) = 7c78774ef73ed1581decad226786d818f0179c183ac8eaea64de2b8a4a57190a
+SIZE (rust/2025-01-09/cargo-1.84.0-x86_64-unknown-freebsd.tar.xz) = 9374044
+SHA256 (rust/2025-01-09/rustc-1.84.0-armv7-unknown-freebsd.tar.xz) = 6c4e5d85102ebe12788e188f62f76d52d4a963f1b5d744adfb0470d79936d037
+SIZE (rust/2025-01-09/rustc-1.84.0-armv7-unknown-freebsd.tar.xz) = 64417652
+SHA256 (rust/2025-01-09/rust-std-1.84.0-armv7-unknown-freebsd.tar.xz) = 972f0a9618c82e0a2f31a1a077c923467f49b4fbc83324bdf15e9a1c9851adfc
+SIZE (rust/2025-01-09/rust-std-1.84.0-armv7-unknown-freebsd.tar.xz) = 23814768
+SHA256 (rust/2025-01-09/cargo-1.84.0-armv7-unknown-freebsd.tar.xz) = d169a0f62b397b3091265c79850974297c789ecd8d2e5f9bf0150035eb0ff4d1
+SIZE (rust/2025-01-09/cargo-1.84.0-armv7-unknown-freebsd.tar.xz) = 8381320
+SHA256 (rust/2025-01-09/rustc-1.84.0-i686-unknown-freebsd.tar.xz) = 147a2f9df4c84ae6ccf234230b4a59d429dc145a26d2b48f52dc8d30d9cf51a2
+SIZE (rust/2025-01-09/rustc-1.84.0-i686-unknown-freebsd.tar.xz) = 71473768
+SHA256 (rust/2025-01-09/rust-std-1.84.0-i686-unknown-freebsd.tar.xz) = 67a1644e15db18dcc1bc06c895ade68c410a4f94cdb501f8d7a4c46ad4d7cbd0
+SIZE (rust/2025-01-09/rust-std-1.84.0-i686-unknown-freebsd.tar.xz) = 25590568
+SHA256 (rust/2025-01-09/cargo-1.84.0-i686-unknown-freebsd.tar.xz) = 8e8a6f75aa84e514d3ba8fd17bbe31680c886d294a2c814858566897ab551de7
+SIZE (rust/2025-01-09/cargo-1.84.0-i686-unknown-freebsd.tar.xz) = 10034576
+SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc-unknown-freebsd.tar.xz) = 33a6d058d7775f8bbfba81953526b03e1f9ffc508f61fac817803666f96d1d65
+SIZE (rust/2025-01-09/rustc-1.84.0-powerpc-unknown-freebsd.tar.xz) = 65409964
+SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc-unknown-freebsd.tar.xz) = 6578cef44a61b1fe4f77092c1de7ab476f00565349a81e7d897b8eef50828873
+SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc-unknown-freebsd.tar.xz) = 23075820
+SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc-unknown-freebsd.tar.xz) = 86d1a608a0e38238979565be4f0f7d7c2fed62a198949114e4280937dec2f513
+SIZE (rust/2025-01-09/cargo-1.84.0-powerpc-unknown-freebsd.tar.xz) = 8636360
+SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc64-unknown-freebsd.tar.xz) = f614c5bba7859560d048c3ed097fb7d4836f21f49851d5ecfc22be33ffed389a
+SIZE (rust/2025-01-09/rustc-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 63942656
+SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc64-unknown-freebsd.tar.xz) = ac9d28fd0e9db2b280f3c10d39c6629ce8e4ccf5ec8835c8aeecfd2b93f5d684
+SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 22959100
+SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 684b96e12aab967e9fb83c65d6844856dfe60db2767ee78bc91084f662500145
+SIZE (rust/2025-01-09/cargo-1.84.0-powerpc64-unknown-freebsd.tar.xz) = 8339836
+SHA256 (rust/2025-01-09/rustc-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 355b9a56f1219fd94ead6157faeebdfbb256d8203283be6f108575b76958bd02
+SIZE (rust/2025-01-09/rustc-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 66488408
+SHA256 (rust/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 5fc0e3589ff0e5a5ac6e038d8dd78f0e77a8067f7f65462cacdce5b76816bfea
+SIZE (rust/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 23196928
+SHA256 (rust/2025-01-09/cargo-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 53c1998bf72b3103df413bfb14cf32c5535aeedf1bcecda49e14a82ded9745f2
+SIZE (rust/2025-01-09/cargo-1.84.0-powerpc64le-unknown-freebsd.tar.xz) = 8761296
+SHA256 (rust/2025-01-09/rustc-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 6421bcc6b35af3e3091349869395fc7fa39870c5b0188eaebc0ca887eeb62da6
+SIZE (rust/2025-01-09/rustc-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 72077080
+SHA256 (rust/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = f95b01526345107b5f84ec45f160d5c314372f2002a82005ffdffc8b28a7c1f0
+SIZE (rust/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 23039224
+SHA256 (rust/2025-01-09/cargo-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = ee370bd3e89a947be859e6d482f815a73938496204deccd2cade4deb138fd996
+SIZE (rust/2025-01-09/cargo-1.84.0-riscv64gc-unknown-freebsd.tar.xz) = 10640860
diff --git a/lang/rust/files/armv7/patch-compiler_rustc__driver__impl_src_signal__handler.rs b/lang/rust/files/armv7/patch-compiler_rustc__driver__impl_src_signal__handler.rs
index 17585c99ce3d..07a775d26727 100644
--- a/lang/rust/files/armv7/patch-compiler_rustc__driver__impl_src_signal__handler.rs
+++ b/lang/rust/files/armv7/patch-compiler_rustc__driver__impl_src_signal__handler.rs
@@ -17,12 +17,12 @@ help: you can convert an `i32` to a `usize` and panic if the converted value doe
 
 --- compiler/rustc_driver_impl/src/signal_handler.rs.orig	2024-05-06 16:00:17 UTC
 +++ compiler/rustc_driver_impl/src/signal_handler.rs
-@@ -40,7 +40,7 @@ extern "C" fn print_stack_trace(_: libc::c_int) {
-     static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] = [ptr::null_mut(); MAX_FRAMES];
-     let stack = unsafe {
+@@ -46,7 +46,7 @@ unsafe extern "C" fn print_stack_trace(_: libc::c_int)
+         // in incredibly undesirable and unexpected ways due to e.g. the allocator deadlocking
+         static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] = [ptr::null_mut(); MAX_FRAMES];
          // Collect return addresses
--        let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
-+        let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), (MAX_FRAMES as i32).try_into().unwrap());
+-        let depth = libc::backtrace(&raw mut STACK_TRACE as _, MAX_FRAMES as i32);
++        let depth = libc::backtrace(&raw mut STACK_TRACE as _, (MAX_FRAMES as i32).try_into().unwrap());
          if depth == 0 {
              return;
          }
diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs
index 33c042330d85..e508c1f7b163 100644
--- a/lang/rust/files/patch-vendor_cc.rs
+++ b/lang/rust/files/patch-vendor_cc.rs
@@ -34,8 +34,8 @@ https://reviews.llvm.org/D77776
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
---- vendor/cc-1.1.34/src/tool.rs.orig	2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.1.34/src/tool.rs
+--- vendor/cc-1.2.0/src/tool.rs.orig	2024-05-09 18:20:47 UTC
++++ vendor/cc-1.2.0/src/tool.rs
 @@ -174,9 +174,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
@@ -47,8 +47,8 @@ https://reviews.llvm.org/D77776
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
---- vendor/cc-1.2.5/src/tool.rs.orig	2024-05-09 18:20:47 UTC
-+++ vendor/cc-1.2.5/src/tool.rs
+--- vendor/cc-1.2.6/src/tool.rs.orig	2024-05-09 18:20:47 UTC
++++ vendor/cc-1.2.6/src/tool.rs
 @@ -174,9 +174,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
diff --git a/lang/rust/files/patch-vendor_libc-0.2.159 b/lang/rust/files/patch-vendor_libc-0.2.159
deleted file mode 100644
index bfae6355b648..000000000000
--- a/lang/rust/files/patch-vendor_libc-0.2.159
+++ /dev/null
@@ -1,745 +0,0 @@
-https://github.com/rust-lang/rust/issues/130677
-
-From 9049542fabce9eea669d1fe3d4d973931c9d7d23 Mon Sep 17 00:00:00 2001
-From: Alan Somers <asomers@gmail.com>
-Date: Mon, 23 Sep 2024 10:22:32 -0600
-Subject: [PATCH] Fix the definition of ino_t on 32-bit FreeBSD 12+
-
-Commit 7437d0a6f1 erroneously defined it as "ulong" instead of u64.
-Nobody noticed the mistake, probably because it was only tested on
-64-bit architectures, where those are equivalent.  But it's a problem
-now, after #3723 , which switched the standard library to a FreeBSD 12
-ABI.
-
-Issue https://github.com/rust-lang/rust/issues/130677
----
- src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs | 2 +-
- src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs | 2 +-
- src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs | 2 +-
- src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs | 2 +-
- src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-index de34069eabdf2..68a8364194607 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-@@ -4,7 +4,7 @@
- pub type nlink_t = u16;
- // Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:
- pub type dev_t = u32;
--// Type of `ino_t` changed from `unsigned int` to `unsigned long` in FreeBSD 12:
-+// Type of `ino_t` changed from `__uint32_t` to `__uint64_t` in FreeBSD 12:
- pub type ino_t = u32;
- 
- s! {
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-index 10fcaa03a4ef6..197400ffb4e28 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-@@ -2,7 +2,7 @@
- 
- pub type nlink_t = u64;
- pub type dev_t = u64;
--pub type ino_t = ::c_ulong;
-+pub type ino_t = u64;
- pub type shmatt_t = ::c_uint;
- 
- s! {
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-index ec6bce2a03091..d3a77d03c48d0 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-@@ -2,7 +2,7 @@
- 
- pub type nlink_t = u64;
- pub type dev_t = u64;
--pub type ino_t = ::c_ulong;
-+pub type ino_t = u64;
- pub type shmatt_t = ::c_uint;
- pub type kpaddr_t = u64;
- pub type kssize_t = i64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-index 160a4baae481b..9d65317d29cb4 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-@@ -2,7 +2,7 @@
- 
- pub type nlink_t = u64;
- pub type dev_t = u64;
--pub type ino_t = ::c_ulong;
-+pub type ino_t = u64;
- pub type shmatt_t = ::c_uint;
- pub type kpaddr_t = u64;
- pub type kssize_t = i64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-index d73215a68ec33..f76208400f324 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-@@ -2,7 +2,7 @@
- 
- pub type nlink_t = u64;
- pub type dev_t = u64;
--pub type ino_t = ::c_ulong;
-+pub type ino_t = u64;
- pub type shmatt_t = ::c_uint;
- pub type kpaddr_t = u64;
- pub type kssize_t = i64;
-
-
-From 8aca9c0126f3aa5a7dce1ad7fc016b4a0d6af70a Mon Sep 17 00:00:00 2001
-From: Alan Somers <asomers@gmail.com>
-Date: Mon, 23 Sep 2024 10:44:13 -0600
-Subject: [PATCH] Fix the definition of "struct stat" on 32-bit FreeBSD 12+
-
-The original definitions were never correct.  But nobody noticed because
-we don't do CI on 32-bit FreeBSD.  The problem is apparent now due to
- #3723 , which caused the nightly toolchain to switch to a FreeBSD 12
-ABI.
-
-Fixes https://github.com/rust-lang/rust/issues/130677
----
- .../{freebsd12/b64.rs => freebsd11/b32.rs}    | 13 +++---
- .../bsd/freebsdlike/freebsd/freebsd11/mod.rs  |  7 +--
- .../bsd/freebsdlike/freebsd/freebsd12/mod.rs  | 43 +++++++++++++++----
- .../bsd/freebsdlike/freebsd/freebsd13/b64.rs  | 34 ---------------
- .../bsd/freebsdlike/freebsd/freebsd13/mod.rs  | 43 +++++++++++++++----
- .../bsd/freebsdlike/freebsd/freebsd14/b64.rs  | 34 ---------------
- .../bsd/freebsdlike/freebsd/freebsd14/mod.rs  | 43 +++++++++++++++----
- .../bsd/freebsdlike/freebsd/freebsd15/b64.rs  | 34 ---------------
- .../bsd/freebsdlike/freebsd/freebsd15/mod.rs  | 43 +++++++++++++++----
- src/unix/bsd/freebsdlike/freebsd/x86.rs       | 25 -----------
- 10 files changed, 146 insertions(+), 173 deletions(-)
- rename src/unix/bsd/freebsdlike/freebsd/{freebsd12/b64.rs => freebsd11/b32.rs} (89%)
- delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
- delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
- delete mode 100644 src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
-
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
-similarity index 89%
-rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
-rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
-
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig	2024-10-24 17:21:07.154172000 +0200
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs	2024-10-24 17:21:02.029962000 +0200
-@@ -0,0 +1,34 @@
-+#[repr(C)]
-+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
-+pub struct stat {
-+    pub st_dev: ::dev_t,
-+    pub st_ino: ::ino_t,
-+    pub st_nlink: ::nlink_t,
-+    pub st_mode: ::mode_t,
-+    st_padding0: i16,
-+    pub st_uid: ::uid_t,
-+    pub st_gid: ::gid_t,
-+    st_padding1: i32,
-+    pub st_rdev: ::dev_t,
-+    pub st_atime: ::time_t,
-+    pub st_atime_nsec: ::c_long,
-+    pub st_mtime: ::time_t,
-+    pub st_mtime_nsec: ::c_long,
-+    pub st_ctime: ::time_t,
-+    pub st_ctime_nsec: ::c_long,
-+    pub st_birthtime: ::time_t,
-+    pub st_birthtime_nsec: ::c_long,
-+    pub st_size: ::off_t,
-+    pub st_blocks: ::blkcnt_t,
-+    pub st_blksize: ::blksize_t,
-+    pub st_flags: ::fflags_t,
-+    pub st_gen: u64,
-+    pub st_spare: [u64; 10],
-+}
-+
-+impl ::Copy for ::stat {}
-+impl ::Clone for ::stat {
-+    fn clone(&self) -> ::stat {
-+        *self
-+    }
-+}
-
-
-index 80c6fa1684530..5c1156581fd61 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
-@@ -3,12 +3,10 @@
- pub struct stat {
-     pub st_dev: ::dev_t,
-     pub st_ino: ::ino_t,
--    pub st_nlink: ::nlink_t,
-     pub st_mode: ::mode_t,
--    st_padding0: i16,
-+    pub st_nlink: ::nlink_t,
-     pub st_uid: ::uid_t,
-     pub st_gid: ::gid_t,
--    st_padding1: i32,
-     pub st_rdev: ::dev_t,
-     pub st_atime: ::time_t,
-     pub st_atime_nsec: ::c_long,
-@@ -16,14 +14,15 @@ pub struct stat {
-     pub st_mtime_nsec: ::c_long,
-     pub st_ctime: ::time_t,
-     pub st_ctime_nsec: ::c_long,
--    pub st_birthtime: ::time_t,
--    pub st_birthtime_nsec: ::c_long,
-     pub st_size: ::off_t,
-     pub st_blocks: ::blkcnt_t,
-     pub st_blksize: ::blksize_t,
-     pub st_flags: ::fflags_t,
--    pub st_gen: u64,
--    pub st_spare: [u64; 10],
-+    pub st_gen: u32,
-+    pub st_lspare: i32,
-+    pub st_birthtime: ::time_t,
-+    pub st_birthtime_nsec: ::c_long,
-+    __unused: [u8; 8],
- }
- 
- impl ::Copy for ::stat {}
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-index 68a8364194607..e416ebf745841 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
-@@ -479,10 +479,11 @@ extern "C" {
- }
- 
- cfg_if! {
--    if #[cfg(any(target_arch = "x86_64",
--                 target_arch = "aarch64",
--                 target_arch = "riscv64"))] {
-+    if #[cfg(target_pointer_width = "64")] {
-         mod b64;
-         pub use self::b64::*;
-+    } else {
-+        mod b32;
-+        pub use self::b32::*;
-     }
- }
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-index 197400ffb4e28..c4431a6458e8f 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
-@@ -218,6 +218,40 @@ s! {
-         /// kthread flag.
-         pub ki_tdflags: ::c_long,
-     }
-+
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_mode: ::mode_t,
-+        st_padding0: i16,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        st_padding1: i32,
-+        pub st_rdev: ::dev_t,
-+        #[cfg(target_arch = "x86")]
-+        st_atim_ext: i32,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_mtim_ext: i32,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_ctim_ext: i32,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_btim_ext: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u64,
-+        pub st_spare: [u64; 10],
-+    }
- }
- 
- s_no_extra_traits! {
-@@ -488,15 +522,6 @@ extern "C" {
-     pub fn basename(path: *mut ::c_char) -> *mut ::c_char;
- }
- 
--cfg_if! {
--    if #[cfg(any(target_arch = "x86_64",
--                 target_arch = "aarch64",
--                 target_arch = "riscv64"))] {
--        mod b64;
--        pub use self::b64::*;
--    }
--}
--
- cfg_if! {
-     if #[cfg(target_arch = "x86_64")] {
-         mod x86_64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
-deleted file mode 100644
-index 80c6fa1684530..0000000000000
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
-+++ /dev/null
-@@ -1,34 +0,0 @@
--#[repr(C)]
--#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
--pub struct stat {
--    pub st_dev: ::dev_t,
--    pub st_ino: ::ino_t,
--    pub st_nlink: ::nlink_t,
--    pub st_mode: ::mode_t,
--    st_padding0: i16,
--    pub st_uid: ::uid_t,
--    pub st_gid: ::gid_t,
--    st_padding1: i32,
--    pub st_rdev: ::dev_t,
--    pub st_atime: ::time_t,
--    pub st_atime_nsec: ::c_long,
--    pub st_mtime: ::time_t,
--    pub st_mtime_nsec: ::c_long,
--    pub st_ctime: ::time_t,
--    pub st_ctime_nsec: ::c_long,
--    pub st_birthtime: ::time_t,
--    pub st_birthtime_nsec: ::c_long,
--    pub st_size: ::off_t,
--    pub st_blocks: ::blkcnt_t,
--    pub st_blksize: ::blksize_t,
--    pub st_flags: ::fflags_t,
--    pub st_gen: u64,
--    pub st_spare: [u64; 10],
--}
--
--impl ::Copy for ::stat {}
--impl ::Clone for ::stat {
--    fn clone(&self) -> ::stat {
--        *self
--    }
--}
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-index d3a77d03c48d0..118404e8b089b 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
-@@ -228,6 +228,40 @@ s! {
-         /// kthread flag.
-         pub ki_tdflags: ::c_long,
-     }
-+
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_mode: ::mode_t,
-+        st_padding0: i16,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        st_padding1: i32,
-+        pub st_rdev: ::dev_t,
-+        #[cfg(target_arch = "x86")]
-+        st_atim_ext: i32,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_mtim_ext: i32,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_ctim_ext: i32,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_btim_ext: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u64,
-+        pub st_spare: [u64; 10],
-+    }
- }
- 
- s_no_extra_traits! {
-@@ -529,15 +563,6 @@ extern "C" {
-     pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t;
- }
- 
--cfg_if! {
--    if #[cfg(any(target_arch = "x86_64",
--                 target_arch = "aarch64",
--                 target_arch = "riscv64"))] {
--        mod b64;
--        pub use self::b64::*;
--    }
--}
--
- cfg_if! {
-     if #[cfg(target_arch = "x86_64")] {
-         mod x86_64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
-deleted file mode 100644
-index 80c6fa1684530..0000000000000
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
-+++ /dev/null
-@@ -1,34 +0,0 @@
--#[repr(C)]
--#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
--pub struct stat {
--    pub st_dev: ::dev_t,
--    pub st_ino: ::ino_t,
--    pub st_nlink: ::nlink_t,
--    pub st_mode: ::mode_t,
--    st_padding0: i16,
--    pub st_uid: ::uid_t,
--    pub st_gid: ::gid_t,
--    st_padding1: i32,
--    pub st_rdev: ::dev_t,
--    pub st_atime: ::time_t,
--    pub st_atime_nsec: ::c_long,
--    pub st_mtime: ::time_t,
--    pub st_mtime_nsec: ::c_long,
--    pub st_ctime: ::time_t,
--    pub st_ctime_nsec: ::c_long,
--    pub st_birthtime: ::time_t,
--    pub st_birthtime_nsec: ::c_long,
--    pub st_size: ::off_t,
--    pub st_blocks: ::blkcnt_t,
--    pub st_blksize: ::blksize_t,
--    pub st_flags: ::fflags_t,
--    pub st_gen: u64,
--    pub st_spare: [u64; 10],
--}
--
--impl ::Copy for ::stat {}
--impl ::Clone for ::stat {
--    fn clone(&self) -> ::stat {
--        *self
--    }
--}
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-index 9d65317d29cb4..e624dd7201b0a 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
-@@ -228,6 +228,40 @@ s! {
-         /// kthread flag.
-         pub ki_tdflags: ::c_long,
-     }
-+
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_mode: ::mode_t,
-+        st_padding0: i16,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        st_padding1: i32,
-+        pub st_rdev: ::dev_t,
-+        #[cfg(target_arch = "x86")]
-+        st_atim_ext: i32,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_mtim_ext: i32,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_ctim_ext: i32,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_btim_ext: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u64,
-+        pub st_spare: [u64; 10],
-+    }
- }
- 
- s_no_extra_traits! {
-@@ -529,15 +563,6 @@ extern "C" {
-     pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t;
- }
- 
--cfg_if! {
--    if #[cfg(any(target_arch = "x86_64",
--                 target_arch = "aarch64",
--                 target_arch = "riscv64"))] {
--        mod b64;
--        pub use self::b64::*;
--    }
--}
--
- cfg_if! {
-     if #[cfg(target_arch = "x86_64")] {
-         mod x86_64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
-deleted file mode 100644
-index 80c6fa1684530..0000000000000
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
-+++ /dev/null
-@@ -1,34 +0,0 @@
--#[repr(C)]
--#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
--pub struct stat {
--    pub st_dev: ::dev_t,
--    pub st_ino: ::ino_t,
--    pub st_nlink: ::nlink_t,
--    pub st_mode: ::mode_t,
--    st_padding0: i16,
--    pub st_uid: ::uid_t,
--    pub st_gid: ::gid_t,
--    st_padding1: i32,
--    pub st_rdev: ::dev_t,
--    pub st_atime: ::time_t,
--    pub st_atime_nsec: ::c_long,
--    pub st_mtime: ::time_t,
--    pub st_mtime_nsec: ::c_long,
--    pub st_ctime: ::time_t,
--    pub st_ctime_nsec: ::c_long,
--    pub st_birthtime: ::time_t,
--    pub st_birthtime_nsec: ::c_long,
--    pub st_size: ::off_t,
--    pub st_blocks: ::blkcnt_t,
--    pub st_blksize: ::blksize_t,
--    pub st_flags: ::fflags_t,
--    pub st_gen: u64,
--    pub st_spare: [u64; 10],
--}
--
--impl ::Copy for ::stat {}
--impl ::Clone for ::stat {
--    fn clone(&self) -> ::stat {
--        *self
--    }
--}
-diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-index f76208400f324..a299af7d5d53e 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
-@@ -228,6 +228,40 @@ s! {
-         /// kthread flag.
-         pub ki_tdflags: ::c_long,
-     }
-+
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_mode: ::mode_t,
-+        st_padding0: i16,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        st_padding1: i32,
-+        pub st_rdev: ::dev_t,
-+        #[cfg(target_arch = "x86")]
-+        st_atim_ext: i32,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_mtim_ext: i32,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_ctim_ext: i32,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        #[cfg(target_arch = "x86")]
-+        st_btim_ext: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u64,
-+        pub st_spare: [u64; 10],
-+    }
- }
- 
- s_no_extra_traits! {
-@@ -529,15 +563,6 @@ extern "C" {
-     pub fn kvm_kerndisp(kd: *mut ::kvm_t) -> ::kssize_t;
- }
- 
--cfg_if! {
--    if #[cfg(any(target_arch = "x86_64",
--                 target_arch = "aarch64",
--                 target_arch = "riscv64"))] {
--        mod b64;
--        pub use self::b64::*;
--    }
--}
--
- cfg_if! {
-     if #[cfg(target_arch = "x86_64")] {
-         mod x86_64;
-diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
-index c3c576ed66681..31a660e7d0a22 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
-@@ -42,31 +42,6 @@ s_no_extra_traits! {
- }
- 
- s! {
--    pub struct stat {
--        pub st_dev: ::dev_t,
--        pub st_ino: ::ino_t,
--        pub st_mode: ::mode_t,
--        pub st_nlink: ::nlink_t,
--        pub st_uid: ::uid_t,
--        pub st_gid: ::gid_t,
--        pub st_rdev: ::dev_t,
--        pub st_atime: ::time_t,
--        pub st_atime_nsec: ::c_long,
--        pub st_mtime: ::time_t,
--        pub st_mtime_nsec: ::c_long,
--        pub st_ctime: ::time_t,
--        pub st_ctime_nsec: ::c_long,
--        pub st_size: ::off_t,
--        pub st_blocks: ::blkcnt_t,
--        pub st_blksize: ::blksize_t,
--        pub st_flags: ::fflags_t,
--        pub st_gen: u32,
--        pub st_lspare: i32,
--        pub st_birthtime: ::time_t,
--        pub st_birthtime_nsec: ::c_long,
--        __unused: [u8; 8],
--    }
--
-     pub struct ucontext_t {
-         pub uc_sigmask: ::sigset_t,
-         pub uc_mcontext: ::mcontext_t,
-
-
-From f381e010b2439579c9f548ef86fb06409c2c55d2 Mon Sep 17 00:00:00 2001
-From: Alan Somers <asomers@gmail.com>
-Date: Mon, 23 Sep 2024 16:03:48 -0600
-Subject: [PATCH] fixup: fix build on powerpc, powerpc64, and arm
-
----
- src/unix/bsd/freebsdlike/freebsd/arm.rs       | 30 -------------------
- src/unix/bsd/freebsdlike/freebsd/powerpc.rs   | 26 ----------------
- src/unix/bsd/freebsdlike/freebsd/powerpc64.rs | 26 ----------------
- 3 files changed, 82 deletions(-)
-
-diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
-index 300b3dd45ca9d..8ff500c65981c 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
-@@ -6,36 +6,6 @@ pub type time_t = i64;
- pub type suseconds_t = i32;
- pub type register_t = i32;
- 
--s! {
--    pub struct stat {
--        pub st_dev: ::dev_t,
--        pub st_ino: ::ino_t,
--        pub st_mode: ::mode_t,
--        pub st_nlink: ::nlink_t,
--        pub st_uid: ::uid_t,
--        pub st_gid: ::gid_t,
--        pub st_rdev: ::dev_t,
--        pub st_atime: ::time_t,
--        pub st_atime_nsec: ::c_long,
--        pub st_atime_pad: ::c_long,
--        pub st_mtime: ::time_t,
--        pub st_mtime_nsec: ::c_long,
--        pub st_mtime_pad: ::c_long,
--        pub st_ctime: ::time_t,
--        pub st_ctime_nsec: ::c_long,
--        pub st_ctime_pad: ::c_long,
--        pub st_size: ::off_t,
--        pub st_blocks: ::blkcnt_t,
--        pub st_blksize: ::blksize_t,
--        pub st_flags: ::fflags_t,
--        pub st_gen: u32,
--        pub st_lspare: i32,
--        pub st_birthtime: ::time_t,
--        pub st_birthtime_nsec: ::c_long,
--        pub st_birthtime_pad: ::c_long,
--    }
--}
--
- // should be pub(crate), but that requires Rust 1.18.0
- cfg_if! {
-     if #[cfg(libc_const_size_of)] {
-diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-index a0120c337e0ad..f84062ba34b93 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -6,32 +6,6 @@ pub type time_t = i64;
- pub type suseconds_t = i32;
- pub type register_t = i32;
- 
--s! {
--    pub struct stat {
--        pub st_dev: ::dev_t,
--        pub st_ino: ::ino_t,
--        pub st_mode: ::mode_t,
--        pub st_nlink: ::nlink_t,
--        pub st_uid: ::uid_t,
--        pub st_gid: ::gid_t,
--        pub st_rdev: ::dev_t,
--        pub st_atime: ::time_t,
--        pub st_atime_nsec: ::c_long,
--        pub st_mtime: ::time_t,
--        pub st_mtime_nsec: ::c_long,
--        pub st_ctime: ::time_t,
--        pub st_ctime_nsec: ::c_long,
--        pub st_size: ::off_t,
--        pub st_blocks: ::blkcnt_t,
--        pub st_blksize: ::blksize_t,
--        pub st_flags: ::fflags_t,
--        pub st_gen: u32,
--        pub st_lspare: i32,
--        pub st_birthtime: ::time_t,
--        pub st_birthtime_nsec: ::c_long,
--    }
--}
--
- // should be pub(crate), but that requires Rust 1.18.0
- cfg_if! {
-     if #[cfg(libc_const_size_of)] {
-diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
-index 7f5b9752264e3..69cf4c5fc88c7 100644
---- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
-+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
-@@ -6,32 +6,6 @@ pub type time_t = i64;
- pub type suseconds_t = i64;
- pub type register_t = i64;
- 
--s! {
--    pub struct stat {
--        pub st_dev: ::dev_t,
--        pub st_ino: ::ino_t,
--        pub st_mode: ::mode_t,
--        pub st_nlink: ::nlink_t,
--        pub st_uid: ::uid_t,
--        pub st_gid: ::gid_t,
--        pub st_rdev: ::dev_t,
--        pub st_atime: ::time_t,
--        pub st_atime_nsec: ::c_long,
--        pub st_mtime: ::time_t,
--        pub st_mtime_nsec: ::c_long,
--        pub st_ctime: ::time_t,
--        pub st_ctime_nsec: ::c_long,
--        pub st_size: ::off_t,
--        pub st_blocks: ::blkcnt_t,
--        pub st_blksize: ::blksize_t,
--        pub st_flags: ::fflags_t,
--        pub st_gen: u32,
--        pub st_lspare: i32,
--        pub st_birthtime: ::time_t,
--        pub st_birthtime_nsec: ::c_long,
--    }
--}
--
- // should be pub(crate), but that requires Rust 1.18.0
- cfg_if! {
-     if #[cfg(libc_const_size_of)] {