diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index bbe35bc40..a21f02220 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -15,16 +15,20 @@ COMMENT-rustfmt =	Rust code formatter
 COMMENT-bootstrap =	Rust binary bootstrap
 COMMENT-src =		Rust source component
 
-V =			1.78.0
+V =			1.81.0
 DISTNAME =		rustc-${V}-src
+REVISION-gdb =		0
+REVISION-clippy =	0
+REVISION-rustfmt =	0
+REVISION-src =		0
 
 # rustc bootstrap version
-BV-aarch64 =		1.78.0
-BV-amd64 =		1.78.0
-BV-i386 =		1.78.0
+BV-aarch64 =		1.80.1
+BV-amd64 =		1.81.0
+BV-i386 =		1.81.0
 BV-powerpc64 =		1.65.0-20221213
-BV-riscv64 =		1.77.0-20240401
-BV-sparc64 =		1.77.2
+BV-riscv64 =		1.80.1
+BV-sparc64 =		1.80.1
 BV =			${BV-${MACHINE_ARCH}}
 
 PKGNAME =		rust-${V}
@@ -145,7 +149,7 @@ BUILD_DEPENDS +=	devel/gdb
 
 .if !${USE_EMB_LLVM:L:Myes}
 MODULES +=			lang/clang
-MODCLANG_VERSION =		16
+MODCLANG_VERSION =		17
 MODCLANG_COMPILER_LINKS =	No
 .else
 WANTLIB-main +=		execinfo
@@ -155,12 +159,15 @@ LIB_DEPENDS-main +=	${LIB_DEPENDS} \
 			net/curl \
 			security/libssh2
 
-RUN_DEPENDS-gdb +=	lang/rust,-main \
-			devel/gdb \
-			devel/llvm/16,-lldb
-RUN_DEPENDS-clippy +=	lang/rust,-main
-RUN_DEPENDS-rustfmt +=	lang/rust,-main
-RUN_DEPENDS-src +=	lang/rust,-main
+RUN_DEPENDS-gdb +=	${FULLPKGNAME-main}:${FULLPKGPATH-main} \
+			devel/gdb
+# BUILD_LLDB is defined by /usr/share/mk/bsd.own.mk
+.if ${BUILD_LLDB:L} == yes
+RUN_DEPENDS-gdb +=	devel/llvm/17,-lldb
+.endif
+RUN_DEPENDS-clippy +=	${FULLPKGNAME-main}:${FULLPKGPATH-main}
+RUN_DEPENDS-rustfmt +=	${FULLPKGNAME-main}:${FULLPKGPATH-main}
+RUN_DEPENDS-src +=	${FULLPKGNAME-main}:${FULLPKGPATH-main}
 
 PKG_ARCH-src =		*
 
@@ -199,7 +206,7 @@ pre-configure:
 
 # - generate config.toml file
 do-configure:
-	echo 'change-id = 118703' >${WRKBUILD}/config.toml
+	echo 'change-id = 125535' >${WRKBUILD}/config.toml
 	echo '[build]' >>${WRKBUILD}/config.toml
 .if ${FLAVOR} == native_bootstrap
 	echo 'rustc = "${LOCALBASE}/bin/rustc"' >>${WRKBUILD}/config.toml
@@ -310,7 +317,7 @@ do-install:
 		${PREFIX}/share/bash-completion/completions
 	-rmdir -p ${PREFIX}/etc/bash_completion.d
 	# compile python stuff
-	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/lib/rustlib/etc
+	${MODPY_COMPILEALL} ${PREFIX}/lib/rustlib/etc
 
 do-test:
 	${TEST_BIN} test --jobs=${MAKE_JOBS} --no-fail-fast
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 83c54663d..eb96e5fac 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,14 +1,14 @@
-SHA256 (rust/rustc-1.78.0-src.tar.xz) = 7wo0+5mYcCj7SLxcuG+KMrwglzYusNYDCpViF5dF4GQ=
-SHA256 (rust/rustc-bootstrap-aarch64-1.78.0.tar.lz) = JozBLwzKPzlvpEfx+cNyq7dptWqrbCEPRr6CYsj9seA=
-SHA256 (rust/rustc-bootstrap-amd64-1.78.0.tar.lz) = zcOIPcsY+5nM4UVW9evOtWQDfbbydgJ1s/OEB7PUkK0=
-SHA256 (rust/rustc-bootstrap-i386-1.78.0.tar.lz) = s7X8IxjVArnDJj4rpQy0x+iEsNiGZThKTb1dOqjrNog=
+SHA256 (rust/rustc-1.81.0-src.tar.xz) = NiF+9+MvQKGA49eb1ma039rtSd04ECOl+3Zf0S0Aks4=
+SHA256 (rust/rustc-bootstrap-aarch64-1.80.1.tar.lz) = 4PYTUtkCPacp8tdrJH+KMydha1c0qIOVOIQPXnYNS18=
+SHA256 (rust/rustc-bootstrap-amd64-1.81.0.tar.lz) = I1THbXt6sv+LqOV6HGuobNnc9V7MwZBSVsNeddorEso=
+SHA256 (rust/rustc-bootstrap-i386-1.81.0.tar.lz) = us8ublnZeTnSI4NeNTxNTCZ/tWK6niQ3QncFGzXB2JE=
 SHA256 (rust/rustc-bootstrap-powerpc64-1.65.0-20221213.tar.lz) = WjJDX6ltqqdxdw5dHUE4czjcD40kK/c3sA6RmstcFRU=
-SHA256 (rust/rustc-bootstrap-riscv64-1.77.0-20240401.tar.lz) = w/1dEmk56rkoBE0CSE6Hgv0uoAQICedwo8UQxdqDfO4=
-SHA256 (rust/rustc-bootstrap-sparc64-1.77.2.tar.lz) = WXkaz9jUH9MIGZl2OY//dlF4G85eqjo6ks5NtOPMjj4=
-SIZE (rust/rustc-1.78.0-src.tar.xz) = 159226864
-SIZE (rust/rustc-bootstrap-aarch64-1.78.0.tar.lz) = 79523624
-SIZE (rust/rustc-bootstrap-amd64-1.78.0.tar.lz) = 84070151
-SIZE (rust/rustc-bootstrap-i386-1.78.0.tar.lz) = 84808398
+SHA256 (rust/rustc-bootstrap-riscv64-1.80.1.tar.lz) = uNRgSLybcnmms+nOS5UsfZE9NrvcO/IO9Al8evSibHA=
+SHA256 (rust/rustc-bootstrap-sparc64-1.80.1.tar.lz) = kdAf4P4f7Ot+wPLbXZlyQRUdf4qoL8hLNYlEzGAe6/Y=
+SIZE (rust/rustc-1.81.0-src.tar.xz) = 216743872
+SIZE (rust/rustc-bootstrap-aarch64-1.80.1.tar.lz) = 80436053
+SIZE (rust/rustc-bootstrap-amd64-1.81.0.tar.lz) = 88478058
+SIZE (rust/rustc-bootstrap-i386-1.81.0.tar.lz) = 88230332
 SIZE (rust/rustc-bootstrap-powerpc64-1.65.0-20221213.tar.lz) = 61728206
-SIZE (rust/rustc-bootstrap-riscv64-1.77.0-20240401.tar.lz) = 69399284
-SIZE (rust/rustc-bootstrap-sparc64-1.77.2.tar.lz) = 87261560
+SIZE (rust/rustc-bootstrap-riscv64-1.80.1.tar.lz) = 81295028
+SIZE (rust/rustc-bootstrap-sparc64-1.80.1.tar.lz) = 89509940
diff --git a/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs b/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs
index aa69b53fc..d9ae35714 100644
--- a/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs
+++ b/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs
@@ -4,7 +4,7 @@ https://github.com/rust-lang/rust/issues/90064
 Index: compiler/rustc_mir_transform/src/abort_unwinding_calls.rs
 --- compiler/rustc_mir_transform/src/abort_unwinding_calls.rs.orig
 +++ compiler/rustc_mir_transform/src/abort_unwinding_calls.rs
-@@ -91,6 +91,7 @@ impl<'tcx> MirPass<'tcx> for AbortUnwindingCalls {
+@@ -92,6 +92,7 @@ impl<'tcx> MirPass<'tcx> for AbortUnwindingCalls {
              // registered for it.
              if !call_can_unwind {
                  cleanups_to_remove.push(id);
diff --git a/lang/rust/patches/patch-compiler_rustc_session_src_options_rs b/lang/rust/patches/patch-compiler_rustc_session_src_options_rs
index e46ac03e8..0a08e9a93 100644
--- a/lang/rust/patches/patch-compiler_rustc_session_src_options_rs
+++ b/lang/rust/patches/patch-compiler_rustc_session_src_options_rs
@@ -4,7 +4,7 @@ aarch64: make -Z branch-protection=bti,pac-ret the default
 Index: compiler/rustc_session/src/options.rs
 --- compiler/rustc_session/src/options.rs.orig
 +++ compiler/rustc_session/src/options.rs
-@@ -1545,6 +1545,24 @@ options! {
+@@ -1618,6 +1618,24 @@ options! {
      // - src/doc/rustc/src/codegen-options/index.md
  }
  
@@ -29,7 +29,7 @@ Index: compiler/rustc_session/src/options.rs
  options! {
      UnstableOptions, Z_OPTIONS, dbopts, "Z", "unstable",
  
-@@ -1570,9 +1588,9 @@ options! {
+@@ -1641,9 +1659,9 @@ options! {
          (default: no)"),
      box_noalias: bool = (true, parse_bool, [TRACKED],
          "emit noalias metadata for box (default: yes)"),
diff --git a/lang/rust/patches/patch-library_std_src_os_unix_net_addr_rs b/lang/rust/patches/patch-library_std_src_os_unix_net_addr_rs
deleted file mode 100644
index 317015f6a..000000000
--- a/lang/rust/patches/patch-library_std_src_os_unix_net_addr_rs
+++ /dev/null
@@ -1,22 +0,0 @@
-Backport https://github.com/rust-lang/rust/pull/123779
-
-Index: library/std/src/os/unix/net/addr.rs
---- library/std/src/os/unix/net/addr.rs.orig
-+++ library/std/src/os/unix/net/addr.rs
-@@ -107,6 +107,16 @@ impl SocketAddr {
-         addr: libc::sockaddr_un,
-         mut len: libc::socklen_t,
-     ) -> io::Result<SocketAddr> {
-+        if cfg!(target_os = "openbsd") {
-+            // on OpenBSD, getsockname(2) returns the actual size of the socket address,
-+            // and not the len of the content. Figure out the length for ourselves.
-+            // https://marc.info/?l=openbsd-bugs&m=170105481926736&w=2
-+            let sun_path: &[u8] =
-+                unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&addr.sun_path) };
-+            len = core::slice::memchr::memchr(0, sun_path)
-+                .map_or(len, |new_len| (new_len + sun_path_offset(&addr)) as libc::socklen_t);
-+        }
-+
-         if len == 0 {
-             // When there is a datagram from unnamed unix socket
-             // linux returns zero bytes of address
diff --git a/lang/rust/patches/patch-library_std_src_sys_pal_unix_os_rs b/lang/rust/patches/patch-library_std_src_sys_pal_unix_os_rs
index 2e3bedc7e..f4cecccf5 100644
--- a/lang/rust/patches/patch-library_std_src_sys_pal_unix_os_rs
+++ b/lang/rust/patches/patch-library_std_src_sys_pal_unix_os_rs
@@ -3,7 +3,7 @@ argv0 isn't suitable as current_exe() in all cases.
 Index: library/std/src/sys/pal/unix/os.rs
 --- library/std/src/sys/pal/unix/os.rs.orig
 +++ library/std/src/sys/pal/unix/os.rs
-@@ -391,14 +391,17 @@ pub fn current_exe() -> io::Result<PathBuf> {
+@@ -382,14 +382,17 @@ pub fn current_exe() -> io::Result<PathBuf> {
          if argv[0].is_null() {
              return Err(io::const_io_error!(
                  io::ErrorKind::Uncategorized,
diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap_py b/lang/rust/patches/patch-src_bootstrap_bootstrap_py
index 9aa53dfb9..4e6afdff7 100644
--- a/lang/rust/patches/patch-src_bootstrap_bootstrap_py
+++ b/lang/rust/patches/patch-src_bootstrap_bootstrap_py
@@ -3,7 +3,7 @@ Workaround for sparc64: bootstrap segfaults without -O3
 Index: src/bootstrap/bootstrap.py
 --- src/bootstrap/bootstrap.py.orig
 +++ src/bootstrap/bootstrap.py
-@@ -977,6 +977,9 @@ class RustBuild(object):
+@@ -999,6 +999,9 @@ class RustBuild(object):
          if "RUSTFLAGS_BOOTSTRAP" in env:
              env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"]
  
diff --git a/lang/rust/patches/patch-src_bootstrap_src_bin_rustc_rs b/lang/rust/patches/patch-src_bootstrap_src_bin_rustc_rs
index 451c72c84..8ad346524 100644
--- a/lang/rust/patches/patch-src_bootstrap_src_bin_rustc_rs
+++ b/lang/rust/patches/patch-src_bootstrap_src_bin_rustc_rs
@@ -5,7 +5,7 @@ try to reduce memory usage on aarch64 and i386:
 Index: src/bootstrap/src/bin/rustc.rs
 --- src/bootstrap/src/bin/rustc.rs.orig
 +++ src/bootstrap/src/bin/rustc.rs
-@@ -150,6 +150,18 @@ fn main() {
+@@ -150,6 +150,19 @@ fn main() {
          {
              cmd.arg("-Ztls-model=initial-exec");
          }
@@ -13,14 +13,15 @@ Index: src/bootstrap/src/bin/rustc.rs
 +        if target.unwrap().contains("aarch64-unknown-openbsd")
 +            && crate_name == Some("rustc")
 +        {
-+            cmd.arg("-Z").arg("fewer-names");
-+        }
-+        if target.unwrap().contains("i686-unknown-openbsd")
-+            && crate_name == Some("rustc_middle")
-+        {
-+            cmd.arg("-Z").arg("fewer-names");
-+            cmd.arg("-C").arg("codegen-units=64");
-+        }
-     } else if std::env::var("MIRI").is_err() {
++           cmd.arg("-Z").arg("fewer-names");
++       }
++       if target.unwrap().contains("i686-unknown-openbsd")
++           && crate_name == Some("rustc_middle")
++       {
++           cmd.arg("-Z").arg("fewer-names");
++           cmd.arg("-C").arg("codegen-units=64");
++       }
++
+     } else {
          // Find any host flags that were passed by bootstrap.
          // The flags are stored in a RUSTC_HOST_FLAGS variable, separated by spaces.
diff --git a/lang/rust/patches/patch-src_bootstrap_src_core_build_steps_test_rs b/lang/rust/patches/patch-src_bootstrap_src_core_build_steps_test_rs
index 5a61a8ae1..74b19d4e4 100644
--- a/lang/rust/patches/patch-src_bootstrap_src_core_build_steps_test_rs
+++ b/lang/rust/patches/patch-src_bootstrap_src_core_build_steps_test_rs
@@ -3,7 +3,7 @@ Disable "Bootstrap" test by default (it requires network).
 Index: src/bootstrap/src/core/build_steps/test.rs
 --- src/bootstrap/src/core/build_steps/test.rs.orig
 +++ src/bootstrap/src/core/build_steps/test.rs
-@@ -2910,7 +2910,7 @@ pub struct Bootstrap;
+@@ -2999,7 +2999,7 @@ pub struct Bootstrap;
  
  impl Step for Bootstrap {
      type Output = ();
diff --git a/lang/rust/patches/patch-src_bootstrap_src_lib_rs b/lang/rust/patches/patch-src_bootstrap_src_lib_rs
index 52818cbeb..549b6fc7a 100644
--- a/lang/rust/patches/patch-src_bootstrap_src_lib_rs
+++ b/lang/rust/patches/patch-src_bootstrap_src_lib_rs
@@ -4,7 +4,7 @@ https://github.com/rust-lang/rust/issues/39900
 Index: src/bootstrap/src/lib.rs
 --- src/bootstrap/src/lib.rs.orig
 +++ src/bootstrap/src/lib.rs
-@@ -1216,7 +1216,6 @@ impl Build {
+@@ -1214,7 +1214,6 @@ Executed at: {executed_at}"#,
              .args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())
diff --git a/lang/rust/patches/patch-src_etc_rust-lldb b/lang/rust/patches/patch-src_etc_rust-lldb
index 41a1352d0..fbde597a6 100644
--- a/lang/rust/patches/patch-src_etc_rust-lldb
+++ b/lang/rust/patches/patch-src_etc_rust-lldb
@@ -8,7 +8,7 @@ Index: src/etc/rust-lldb
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
-+lldb=lldb-16
++lldb=lldb-17
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else
diff --git a/lang/rust/patches/patch-vendor_libgit2-sys_build_rs b/lang/rust/patches/patch-vendor_libgit2-sys_build_rs
index f06768bc8..8bd6039da 100644
--- a/lang/rust/patches/patch-vendor_libgit2-sys_build_rs
+++ b/lang/rust/patches/patch-vendor_libgit2-sys_build_rs
@@ -1,8 +1,8 @@
 libgit2: force embedded version
 
-Index: vendor/libgit2-sys/build.rs
---- vendor/libgit2-sys/build.rs.orig
-+++ vendor/libgit2-sys/build.rs
+Index: vendor/libgit2-sys-0.17.0+1.8.1/build.rs
+--- vendor/libgit2-sys-0.17.0+1.8.1/build.rs.orig
++++ vendor/libgit2-sys-0.17.0+1.8.1/build.rs
 @@ -26,6 +26,7 @@ fn main() {
      let ssh = env::var("CARGO_FEATURE_SSH").is_ok();
      let vendored = env::var("CARGO_FEATURE_VENDORED").is_ok();
diff --git a/lang/rust/patches/patch-vendor_openssl-0_10_57_src_conf_rs b/lang/rust/patches/patch-vendor_openssl-0_10_57_src_conf_rs
new file mode 100644
index 000000000..a51befb8c
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-0_10_57_src_conf_rs
@@ -0,0 +1,21 @@
+https://github.com/sfackler/rust-openssl/pull/2287
+
+Index: vendor/openssl-0.10.57/src/conf.rs
+--- vendor/openssl-0.10.57/src/conf.rs.orig
++++ vendor/openssl-0.10.57/src/conf.rs
+@@ -8,7 +8,7 @@ foreign_type_and_impl_send_sync! {
+     pub struct ConfRef;
+ }
+ 
+-#[cfg(not(boringssl))]
++#[cfg(not(any(boringssl,libressl400)))]
+ mod methods {
+     use super::Conf;
+     use crate::cvt_p;
+@@ -61,5 +61,5 @@ mod methods {
+         }
+     }
+ }
+-#[cfg(not(boringssl))]
++#[cfg(not(any(boringssl,libressl400)))]
+ pub use methods::*;
diff --git a/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_build_cfgs_rs b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_build_cfgs_rs
new file mode 100644
index 000000000..ae7af3811
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_build_cfgs_rs
@@ -0,0 +1,15 @@
+https://github.com/sfackler/rust-openssl/pull/2287
+
+Index: vendor/openssl-sys-0.9.102/build/cfgs.rs
+--- vendor/openssl-sys-0.9.102/build/cfgs.rs.orig
++++ vendor/openssl-sys-0.9.102/build/cfgs.rs
+@@ -65,6 +65,9 @@ pub fn get(openssl_version: Option<u64>, libressl_vers
+         if libressl_version >= 0x3_09_00_00_0 {
+             cfgs.push("libressl390");
+         }
++        if libressl_version >= 0x4_00_00_00_0 {
++            cfgs.push("libressl400");
++        }
+     } else {
+         let openssl_version = openssl_version.unwrap();
+ 
diff --git a/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_conf_rs b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_conf_rs
new file mode 100644
index 000000000..8d8763309
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_conf_rs
@@ -0,0 +1,20 @@
+https://github.com/sfackler/rust-openssl/pull/2287
+
+Index: vendor/openssl-sys-0.9.102/src/handwritten/conf.rs
+--- vendor/openssl-sys-0.9.102/src/handwritten/conf.rs.orig
++++ vendor/openssl-sys-0.9.102/src/handwritten/conf.rs
+@@ -1,7 +1,13 @@
+ use super::super::*;
+ 
++const_ptr_api! {
++    extern "C" {
++        pub fn NCONF_new(meth: #[const_ptr_if(libressl400)] CONF_METHOD) -> *mut CONF;
++    }
++}
++
+ extern "C" {
+-    pub fn NCONF_new(meth: *mut CONF_METHOD) -> *mut CONF;
++    #[cfg(not(libressl400))]
+     pub fn NCONF_default() -> *mut CONF_METHOD;
+     pub fn NCONF_free(conf: *mut CONF);
+ }
diff --git a/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_types_rs b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_types_rs
new file mode 100644
index 000000000..22fbbdaf7
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_types_rs
@@ -0,0 +1,13 @@
+https://github.com/sfackler/rust-openssl/pull/2287
+
+Index: vendor/openssl-sys-0.9.102/src/handwritten/types.rs
+--- vendor/openssl-sys-0.9.102/src/handwritten/types.rs.orig
++++ vendor/openssl-sys-0.9.102/src/handwritten/types.rs
+@@ -458,6 +458,7 @@ pub struct X509V3_CTX {
+     subject_cert: *mut c_void,
+     subject_req: *mut c_void,
+     crl: *mut c_void,
++    #[cfg(not(libressl400))]
+     db_meth: *mut c_void,
+     db: *mut c_void,
+     #[cfg(ossl300)]
diff --git a/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_rs b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_rs
new file mode 100644
index 000000000..1f0f048d2
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_rs
@@ -0,0 +1,26 @@
+https://github.com/sfackler/rust-openssl/pull/2227
+
+Index: vendor/openssl-sys-0.9.102/src/handwritten/x509.rs
+--- vendor/openssl-sys-0.9.102/src/handwritten/x509.rs.orig
++++ vendor/openssl-sys-0.9.102/src/handwritten/x509.rs
+@@ -1,10 +1,16 @@
+ use super::super::*;
+ use libc::*;
+ 
+-#[repr(C)]
+-pub struct X509_VAL {
+-    pub notBefore: *mut ASN1_TIME,
+-    pub notAfter: *mut ASN1_TIME,
++cfg_if! {
++    if #[cfg(libressl400)] {
++        pub enum X509_VAL {}
++    } else {
++        #[repr(C)]
++        pub struct X509_VAL {
++            pub notBefore: *mut ASN1_TIME,
++            pub notAfter: *mut ASN1_TIME,
++        }
++    }
+ }
+ 
+ pub enum X509_NAME_ENTRY {}
diff --git a/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_vfy_rs b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_vfy_rs
new file mode 100644
index 000000000..04ff5020c
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_openssl-sys-0_9_102_src_handwritten_x509_vfy_rs
@@ -0,0 +1,23 @@
+https://github.com/sfackler/rust-openssl/pull/2276
+
+Index: vendor/openssl-sys-0.9.102/src/handwritten/x509_vfy.rs
+--- vendor/openssl-sys-0.9.102/src/handwritten/x509_vfy.rs.orig
++++ vendor/openssl-sys-0.9.102/src/handwritten/x509_vfy.rs
+@@ -9,10 +9,15 @@ extern "C" {
+     pub fn X509_LOOKUP_meth_free(method: *mut X509_LOOKUP_METHOD);
+ }
+ 
++const_ptr_api! {
++    extern "C" {
++        pub fn X509_LOOKUP_hash_dir() -> #[const_ptr_if(libressl400)] X509_LOOKUP_METHOD;
++        pub fn X509_LOOKUP_file() -> #[const_ptr_if(libressl400)] X509_LOOKUP_METHOD;
++    }
++}
++
+ extern "C" {
+     pub fn X509_LOOKUP_free(ctx: *mut X509_LOOKUP);
+-    pub fn X509_LOOKUP_hash_dir() -> *mut X509_LOOKUP_METHOD;
+-    pub fn X509_LOOKUP_file() -> *mut X509_LOOKUP_METHOD;
+     pub fn X509_LOOKUP_ctrl(
+         ctx: *mut X509_LOOKUP,
+         cmd: c_int,
diff --git a/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs b/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs
index ca80160de..70346a716 100644
--- a/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs
+++ b/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs
@@ -1,14 +1,14 @@
 The LibreSSL version in -current isn't explicitly supported.
 
-Index: vendor/openssl-sys/build/main.rs
---- vendor/openssl-sys/build/main.rs.orig
-+++ vendor/openssl-sys/build/main.rs
-@@ -300,7 +300,7 @@ See rust-openssl documentation for more information:
-             (3, 8, 0) => ('3', '8', '0'),
-             (3, 8, 1) => ('3', '8', '1'),
+Index: vendor/openssl-sys-0.9.102/build/main.rs
+--- vendor/openssl-sys-0.9.102/build/main.rs.orig
++++ vendor/openssl-sys-0.9.102/build/main.rs
+@@ -304,7 +304,7 @@ See rust-openssl documentation for more information:
              (3, 8, _) => ('3', '8', 'x'),
+             (3, 9, 0) => ('3', '9', '0'),
+             (3, 9, _) => ('3', '9', 'x'),
 -            _ => version_error(),
-+            _ => ('3', '8', 'x'),
++            _ => ('4', '0', 'x'),
          };
  
          println!("cargo:libressl=true");
diff --git a/lang/rust/patches/patch-vendor_openssl_build_rs b/lang/rust/patches/patch-vendor_openssl_build_rs
index 634995fb6..ac61049fe 100644
--- a/lang/rust/patches/patch-vendor_openssl_build_rs
+++ b/lang/rust/patches/patch-vendor_openssl_build_rs
@@ -1,9 +1,9 @@
 https://github.com/sfackler/rust-openssl/pull/2124
 
-Index: vendor/openssl/build.rs
---- vendor/openssl/build.rs.orig
-+++ vendor/openssl/build.rs
-@@ -81,6 +81,9 @@ fn main() {
+Index: vendor/openssl-0.10.57/build.rs
+--- vendor/openssl-0.10.57/build.rs.orig
++++ vendor/openssl-0.10.57/build.rs
+@@ -73,6 +73,9 @@ fn main() {
          for var in vars.split(',') {
              println!("cargo:rustc-cfg=osslconf=\"{}\"", var);
          }
diff --git a/lang/rust/patches/patch-vendor_openssl_src_lib_rs b/lang/rust/patches/patch-vendor_openssl_src_lib_rs
index 578b1f029..c91228207 100644
--- a/lang/rust/patches/patch-vendor_openssl_src_lib_rs
+++ b/lang/rust/patches/patch-vendor_openssl_src_lib_rs
@@ -1,9 +1,9 @@
 Part of https://github.com/sfackler/rust-openssl/pull/2121
 
-Index: vendor/openssl/src/lib.rs
---- vendor/openssl/src/lib.rs.orig
-+++ vendor/openssl/src/lib.rs
-@@ -218,6 +218,15 @@ fn cvt_p_const<T>(r: *const T) -> Result<*const T, Err
+Index: vendor/openssl-0.10.57/src/lib.rs
+--- vendor/openssl-0.10.57/src/lib.rs.orig
++++ vendor/openssl-0.10.57/src/lib.rs
+@@ -204,6 +204,15 @@ fn cvt_p<T>(r: *mut T) -> Result<*mut T, ErrorStack> {
  }
  
  #[inline]
diff --git a/lang/rust/patches/patch-vendor_psm_src_arch_x86_64_s b/lang/rust/patches/patch-vendor_psm_src_arch_x86_64_s
index 8803d9ab0..0992098c0 100644
--- a/lang/rust/patches/patch-vendor_psm_src_arch_x86_64_s
+++ b/lang/rust/patches/patch-vendor_psm_src_arch_x86_64_s
@@ -1,8 +1,8 @@
 Add some endbr64 instructions: required for rustc binary on amd64 with IBT.
 
-Index: vendor/psm/src/arch/x86_64.s
---- vendor/psm/src/arch/x86_64.s.orig
-+++ vendor/psm/src/arch/x86_64.s
+Index: vendor/psm-0.1.21/src/arch/x86_64.s
+--- vendor/psm-0.1.21/src/arch/x86_64.s.orig
++++ vendor/psm-0.1.21/src/arch/x86_64.s
 @@ -26,6 +26,7 @@ TYPE(rust_psm_stack_direction)
  FUNCTION(rust_psm_stack_direction):
  /* extern "sysv64" fn() -> u8 (%al) */
diff --git a/lang/rust/pkg/PLIST-gdb b/lang/rust/pkg/PLIST-gdb
index 2c1093af1..c411f2bbd 100644
--- a/lang/rust/pkg/PLIST-gdb
+++ b/lang/rust/pkg/PLIST-gdb
@@ -3,11 +3,17 @@ bin/rust-gdb
 bin/rust-lldb
 lib/rustlib/etc/
 ${MODPY_COMMENT}lib/rustlib/etc/${MODPY_PYCACHE}/
+lib/rustlib/etc/${MODPY_PYCACHE}gdb_load_rust_pretty_printers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}gdb_load_rust_pretty_printers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}gdb_lookup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}gdb_lookup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}gdb_providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}gdb_providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}lldb_lookup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}lldb_lookup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}lldb_providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}lldb_providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}rust_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/rustlib/etc/${MODPY_PYCACHE}rust_types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/rustlib/etc/gdb_load_rust_pretty_printers.py
 lib/rustlib/etc/gdb_lookup.py
diff --git a/lang/rust/pkg/PLIST-src b/lang/rust/pkg/PLIST-src
index 191c44d64..dc1fb5eb9 100644
--- a/lang/rust/pkg/PLIST-src
+++ b/lang/rust/pkg/PLIST-src
@@ -75,6 +75,7 @@ lib/rustlib/src/rust/library/alloc/src/ffi/c_str.rs
 lib/rustlib/src/rust/library/alloc/src/ffi/c_str/tests.rs
 lib/rustlib/src/rust/library/alloc/src/ffi/mod.rs
 lib/rustlib/src/rust/library/alloc/src/fmt.rs
+lib/rustlib/src/rust/library/alloc/src/lib.miri.rs
 lib/rustlib/src/rust/library/alloc/src/lib.rs
 lib/rustlib/src/rust/library/alloc/src/macros.rs
 lib/rustlib/src/rust/library/alloc/src/raw_vec/
@@ -135,6 +136,7 @@ lib/rustlib/src/rust/library/alloc/tests/task.rs
 lib/rustlib/src/rust/library/alloc/tests/thin_box.rs
 lib/rustlib/src/rust/library/alloc/tests/vec.rs
 lib/rustlib/src/rust/library/alloc/tests/vec_deque.rs
+lib/rustlib/src/rust/library/alloc/tests/vec_deque_alloc_error.rs
 lib/rustlib/src/rust/library/backtrace/
 lib/rustlib/src/rust/library/backtrace/.github/
 lib/rustlib/src/rust/library/backtrace/.github/actions/
@@ -286,6 +288,7 @@ lib/rustlib/src/rust/library/core/benches/str/
 lib/rustlib/src/rust/library/core/benches/str.rs
 lib/rustlib/src/rust/library/core/benches/str/char_count.rs
 lib/rustlib/src/rust/library/core/benches/str/corpora.rs
+lib/rustlib/src/rust/library/core/benches/str/debug.rs
 lib/rustlib/src/rust/library/core/benches/str/iter.rs
 lib/rustlib/src/rust/library/core/benches/tuple.rs
 lib/rustlib/src/rust/library/core/src/
@@ -348,14 +351,17 @@ lib/rustlib/src/rust/library/core/src/ffi/c_ulonglong.md
 lib/rustlib/src/rust/library/core/src/ffi/c_ushort.md
 lib/rustlib/src/rust/library/core/src/ffi/c_void.md
 lib/rustlib/src/rust/library/core/src/ffi/mod.rs
+lib/rustlib/src/rust/library/core/src/ffi/va_list.rs
 lib/rustlib/src/rust/library/core/src/fmt/
 lib/rustlib/src/rust/library/core/src/fmt/builders.rs
 lib/rustlib/src/rust/library/core/src/fmt/float.rs
+lib/rustlib/src/rust/library/core/src/fmt/fmt_trait_method_doc.md
 lib/rustlib/src/rust/library/core/src/fmt/mod.rs
 lib/rustlib/src/rust/library/core/src/fmt/nofloat.rs
 lib/rustlib/src/rust/library/core/src/fmt/num.rs
 lib/rustlib/src/rust/library/core/src/fmt/rt.rs
 lib/rustlib/src/rust/library/core/src/future/
+lib/rustlib/src/rust/library/core/src/future/async_drop.rs
 lib/rustlib/src/rust/library/core/src/future/future.rs
 lib/rustlib/src/rust/library/core/src/future/into_future.rs
 lib/rustlib/src/rust/library/core/src/future/join.rs
@@ -425,6 +431,7 @@ lib/rustlib/src/rust/library/core/src/iter/traits/iterator.rs
 lib/rustlib/src/rust/library/core/src/iter/traits/marker.rs
 lib/rustlib/src/rust/library/core/src/iter/traits/mod.rs
 lib/rustlib/src/rust/library/core/src/iter/traits/unchecked_iterator.rs
+lib/rustlib/src/rust/library/core/src/lib.miri.rs
 lib/rustlib/src/rust/library/core/src/lib.rs
 lib/rustlib/src/rust/library/core/src/macros/
 lib/rustlib/src/rust/library/core/src/macros/mod.rs
@@ -456,6 +463,8 @@ lib/rustlib/src/rust/library/core/src/num/dec2flt/slow.rs
 lib/rustlib/src/rust/library/core/src/num/dec2flt/table.rs
 lib/rustlib/src/rust/library/core/src/num/diy_float.rs
 lib/rustlib/src/rust/library/core/src/num/error.rs
+lib/rustlib/src/rust/library/core/src/num/f128.rs
+lib/rustlib/src/rust/library/core/src/num/f16.rs
 lib/rustlib/src/rust/library/core/src/num/f32.rs
 lib/rustlib/src/rust/library/core/src/num/f64.rs
 lib/rustlib/src/rust/library/core/src/num/flt2dec/
@@ -510,10 +519,11 @@ lib/rustlib/src/rust/library/core/src/panic/location.rs
 lib/rustlib/src/rust/library/core/src/panic/panic_info.rs
 lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs
 lib/rustlib/src/rust/library/core/src/panicking.rs
+lib/rustlib/src/rust/library/core/src/pat.rs
 lib/rustlib/src/rust/library/core/src/pin.rs
 lib/rustlib/src/rust/library/core/src/prelude/
+lib/rustlib/src/rust/library/core/src/prelude/common.rs
 lib/rustlib/src/rust/library/core/src/prelude/mod.rs
-lib/rustlib/src/rust/library/core/src/prelude/v1.rs
 lib/rustlib/src/rust/library/core/src/primitive.rs
 lib/rustlib/src/rust/library/core/src/primitive_docs.rs
 lib/rustlib/src/rust/library/core/src/ptr/
@@ -524,6 +534,10 @@ lib/rustlib/src/rust/library/core/src/ptr/mod.rs
 lib/rustlib/src/rust/library/core/src/ptr/mut_ptr.rs
 lib/rustlib/src/rust/library/core/src/ptr/non_null.rs
 lib/rustlib/src/rust/library/core/src/ptr/unique.rs
+lib/rustlib/src/rust/library/core/src/range/
+lib/rustlib/src/rust/library/core/src/range.rs
+lib/rustlib/src/rust/library/core/src/range/iter.rs
+lib/rustlib/src/rust/library/core/src/range/legacy.rs
 lib/rustlib/src/rust/library/core/src/result.rs
 lib/rustlib/src/rust/library/core/src/slice/
 lib/rustlib/src/rust/library/core/src/slice/ascii.rs
@@ -536,8 +550,22 @@ lib/rustlib/src/rust/library/core/src/slice/memchr.rs
 lib/rustlib/src/rust/library/core/src/slice/mod.rs
 lib/rustlib/src/rust/library/core/src/slice/raw.rs
 lib/rustlib/src/rust/library/core/src/slice/rotate.rs
-lib/rustlib/src/rust/library/core/src/slice/select.rs
-lib/rustlib/src/rust/library/core/src/slice/sort.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/
+lib/rustlib/src/rust/library/core/src/slice/sort/mod.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/select.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/shared/
+lib/rustlib/src/rust/library/core/src/slice/sort/shared/mod.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/shared/pivot.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/shared/smallsort.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/stable/
+lib/rustlib/src/rust/library/core/src/slice/sort/stable/drift.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/stable/merge.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/stable/mod.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/stable/quicksort.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/unstable/
+lib/rustlib/src/rust/library/core/src/slice/sort/unstable/heapsort.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/unstable/mod.rs
+lib/rustlib/src/rust/library/core/src/slice/sort/unstable/quicksort.rs
 lib/rustlib/src/rust/library/core/src/slice/specialize.rs
 lib/rustlib/src/rust/library/core/src/str/
 lib/rustlib/src/rust/library/core/src/str/converts.rs
@@ -560,6 +588,7 @@ lib/rustlib/src/rust/library/core/src/task/ready.rs
 lib/rustlib/src/rust/library/core/src/task/wake.rs
 lib/rustlib/src/rust/library/core/src/time.rs
 lib/rustlib/src/rust/library/core/src/tuple.rs
+lib/rustlib/src/rust/library/core/src/ub_checks.rs
 lib/rustlib/src/rust/library/core/src/unicode/
 lib/rustlib/src/rust/library/core/src/unicode/mod.rs
 lib/rustlib/src/rust/library/core/src/unicode/printable.py
@@ -806,6 +835,7 @@ lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/mask_ops_impl/
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/mask_ops_impl/mask_macros.rs
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/mask_ops_impl/masksize.rs
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/mask_ops_impl/mod.rs
+lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/masked_load_store.rs
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/masks.rs
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/ops_macros.rs
 lib/rustlib/src/rust/library/portable-simd/crates/core_simd/tests/pointers.rs
@@ -824,6 +854,8 @@ lib/rustlib/src/rust/library/portable-simd/crates/std_float/
 lib/rustlib/src/rust/library/portable-simd/crates/std_float/Cargo.toml
 lib/rustlib/src/rust/library/portable-simd/crates/std_float/src/
 lib/rustlib/src/rust/library/portable-simd/crates/std_float/src/lib.rs
+lib/rustlib/src/rust/library/portable-simd/crates/std_float/tests/
+lib/rustlib/src/rust/library/portable-simd/crates/std_float/tests/float.rs
 lib/rustlib/src/rust/library/portable-simd/crates/test_helpers/
 lib/rustlib/src/rust/library/portable-simd/crates/test_helpers/Cargo.toml
 lib/rustlib/src/rust/library/portable-simd/crates/test_helpers/src/
@@ -844,11 +876,11 @@ lib/rustlib/src/rust/library/proc_macro/src/bridge/fxhash.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/handle.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/mod.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/rpc.rs
-lib/rustlib/src/rust/library/proc_macro/src/bridge/scoped_cell.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/selfless_reify.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/server.rs
 lib/rustlib/src/rust/library/proc_macro/src/bridge/symbol.rs
 lib/rustlib/src/rust/library/proc_macro/src/diagnostic.rs
+lib/rustlib/src/rust/library/proc_macro/src/escape.rs
 lib/rustlib/src/rust/library/proc_macro/src/lib.rs
 lib/rustlib/src/rust/library/proc_macro/src/quote.rs
 lib/rustlib/src/rust/library/profiler_builtins/
@@ -901,6 +933,12 @@ lib/rustlib/src/rust/library/std/src/env/tests.rs
 lib/rustlib/src/rust/library/std/src/error/
 lib/rustlib/src/rust/library/std/src/error.rs
 lib/rustlib/src/rust/library/std/src/error/tests.rs
+lib/rustlib/src/rust/library/std/src/f128/
+lib/rustlib/src/rust/library/std/src/f128.rs
+lib/rustlib/src/rust/library/std/src/f128/tests.rs
+lib/rustlib/src/rust/library/std/src/f16/
+lib/rustlib/src/rust/library/std/src/f16.rs
+lib/rustlib/src/rust/library/std/src/f16/tests.rs
 lib/rustlib/src/rust/library/std/src/f32/
 lib/rustlib/src/rust/library/std/src/f32.rs
 lib/rustlib/src/rust/library/std/src/f32/tests.rs
@@ -953,6 +991,7 @@ lib/rustlib/src/rust/library/std/src/io/util/
 lib/rustlib/src/rust/library/std/src/io/util.rs
 lib/rustlib/src/rust/library/std/src/io/util/tests.rs
 lib/rustlib/src/rust/library/std/src/keyword_docs.rs
+lib/rustlib/src/rust/library/std/src/lib.miri.rs
 lib/rustlib/src/rust/library/std/src/lib.rs
 lib/rustlib/src/rust/library/std/src/macros.rs
 lib/rustlib/src/rust/library/std/src/net/
@@ -983,6 +1022,10 @@ lib/rustlib/src/rust/library/std/src/os/android/fs.rs
 lib/rustlib/src/rust/library/std/src/os/android/mod.rs
 lib/rustlib/src/rust/library/std/src/os/android/net.rs
 lib/rustlib/src/rust/library/std/src/os/android/raw.rs
+lib/rustlib/src/rust/library/std/src/os/darwin/
+lib/rustlib/src/rust/library/std/src/os/darwin/fs.rs
+lib/rustlib/src/rust/library/std/src/os/darwin/mod.rs
+lib/rustlib/src/rust/library/std/src/os/darwin/raw.rs
 lib/rustlib/src/rust/library/std/src/os/dragonfly/
 lib/rustlib/src/rust/library/std/src/os/dragonfly/fs.rs
 lib/rustlib/src/rust/library/std/src/os/dragonfly/mod.rs
@@ -1038,9 +1081,7 @@ lib/rustlib/src/rust/library/std/src/os/illumos/fs.rs
 lib/rustlib/src/rust/library/std/src/os/illumos/mod.rs
 lib/rustlib/src/rust/library/std/src/os/illumos/raw.rs
 lib/rustlib/src/rust/library/std/src/os/ios/
-lib/rustlib/src/rust/library/std/src/os/ios/fs.rs
 lib/rustlib/src/rust/library/std/src/os/ios/mod.rs
-lib/rustlib/src/rust/library/std/src/os/ios/raw.rs
 lib/rustlib/src/rust/library/std/src/os/l4re/
 lib/rustlib/src/rust/library/std/src/os/l4re/fs.rs
 lib/rustlib/src/rust/library/std/src/os/l4re/mod.rs
@@ -1052,9 +1093,7 @@ lib/rustlib/src/rust/library/std/src/os/linux/net.rs
 lib/rustlib/src/rust/library/std/src/os/linux/process.rs
 lib/rustlib/src/rust/library/std/src/os/linux/raw.rs
 lib/rustlib/src/rust/library/std/src/os/macos/
-lib/rustlib/src/rust/library/std/src/os/macos/fs.rs
 lib/rustlib/src/rust/library/std/src/os/macos/mod.rs
-lib/rustlib/src/rust/library/std/src/os/macos/raw.rs
 lib/rustlib/src/rust/library/std/src/os/mod.rs
 lib/rustlib/src/rust/library/std/src/os/net/
 lib/rustlib/src/rust/library/std/src/os/net/linux_ext/
@@ -1142,10 +1181,6 @@ lib/rustlib/src/rust/library/std/src/os/wasi/net/
 lib/rustlib/src/rust/library/std/src/os/wasi/net/mod.rs
 lib/rustlib/src/rust/library/std/src/os/wasip2/
 lib/rustlib/src/rust/library/std/src/os/wasip2/mod.rs
-lib/rustlib/src/rust/library/std/src/os/watchos/
-lib/rustlib/src/rust/library/std/src/os/watchos/fs.rs
-lib/rustlib/src/rust/library/std/src/os/watchos/mod.rs
-lib/rustlib/src/rust/library/std/src/os/watchos/raw.rs
 lib/rustlib/src/rust/library/std/src/os/windows/
 lib/rustlib/src/rust/library/std/src/os/windows/ffi.rs
 lib/rustlib/src/rust/library/std/src/os/windows/fs.rs
@@ -1177,12 +1212,13 @@ lib/rustlib/src/rust/library/std/src/panic/
 lib/rustlib/src/rust/library/std/src/panic.rs
 lib/rustlib/src/rust/library/std/src/panic/tests.rs
 lib/rustlib/src/rust/library/std/src/panicking.rs
+lib/rustlib/src/rust/library/std/src/pat.rs
 lib/rustlib/src/rust/library/std/src/path/
 lib/rustlib/src/rust/library/std/src/path.rs
 lib/rustlib/src/rust/library/std/src/path/tests.rs
 lib/rustlib/src/rust/library/std/src/prelude/
+lib/rustlib/src/rust/library/std/src/prelude/common.rs
 lib/rustlib/src/rust/library/std/src/prelude/mod.rs
-lib/rustlib/src/rust/library/std/src/prelude/v1.rs
 lib/rustlib/src/rust/library/std/src/process/
 lib/rustlib/src/rust/library/std/src/process.rs
 lib/rustlib/src/rust/library/std/src/process/tests.rs
@@ -1230,7 +1266,9 @@ lib/rustlib/src/rust/library/std/src/sync/rwlock/
 lib/rustlib/src/rust/library/std/src/sync/rwlock.rs
 lib/rustlib/src/rust/library/std/src/sync/rwlock/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/
+lib/rustlib/src/rust/library/std/src/sys/backtrace.rs
 lib/rustlib/src/rust/library/std/src/sys/cmath.rs
+lib/rustlib/src/rust/library/std/src/sys/exit_guard.rs
 lib/rustlib/src/rust/library/std/src/sys/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/os_str/
 lib/rustlib/src/rust/library/std/src/sys/os_str/bytes/
@@ -1251,12 +1289,12 @@ lib/rustlib/src/rust/library/std/src/sys/pal/hermit/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/fd.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/fs.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/futex.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/hermit/io.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/net.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/hermit/thread_local_dtor.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/hermit/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/itron/
 lib/rustlib/src/rust/library/std/src/sys/pal/itron/abi.rs
@@ -1291,12 +1329,12 @@ lib/rustlib/src/rust/library/std/src/sys/pal/sgx/alloc.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/args.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/fd.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/sgx/libunwind_integration.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/net.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/sgx/thread_local_key.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/thread_parking.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/sgx/waitqueue/
@@ -1322,8 +1360,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/solid/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/solid/net.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/solid/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/solid/stdio.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/solid/thread_local_dtor.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/solid/thread_local_key.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/solid/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/teeos/
 lib/rustlib/src/rust/library/std/src/sys/pal/teeos/alloc.rs
@@ -1333,7 +1369,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/teeos/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/teeos/rand.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/teeos/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/teeos/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/teeos/thread_local_dtor.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/alloc.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/args.rs
@@ -1341,6 +1376,7 @@ lib/rustlib/src/rust/library/std/src/sys/pal/uefi/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/helpers.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/os.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/uefi/process.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/uefi/thread.rs
@@ -1353,13 +1389,20 @@ lib/rustlib/src/rust/library/std/src/sys/pal/unix/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/fd/
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/fd.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/fd/tests.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/fs/
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/fs.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/fs/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/futex.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/io.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/kernel_copy/
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/kernel_copy.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/kernel_copy/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/l4re.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/linux/
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/linux/mod.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/linux/pidfd/
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/linux/pidfd.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/linux/pidfd/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/net.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/os/
@@ -1386,13 +1429,7 @@ lib/rustlib/src/rust/library/std/src/sys/pal/unix/rand.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/stack_overflow.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_local_dtor.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_local_key.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/darwin.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/mod.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/netbsd.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/pthread.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unix/weak.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/
@@ -1409,9 +1446,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/pipe.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/process.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_local_dtor.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_local_key.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_parking.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasi/
 lib/rustlib/src/rust/library/std/src/sys/pal/wasi/args.rs
@@ -1427,6 +1461,7 @@ lib/rustlib/src/rust/library/std/src/sys/pal/wasi/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasi/thread.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasi/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasip2/
+lib/rustlib/src/rust/library/std/src/sys/pal/wasip2/cabi_realloc.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasip2/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/wasm/
 lib/rustlib/src/rust/library/std/src/sys/pal/wasm/alloc.rs
@@ -1439,7 +1474,9 @@ lib/rustlib/src/rust/library/std/src/sys/pal/windows/
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/alloc/
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/alloc.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/alloc/tests.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/windows/api/
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/api.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/windows/api/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/args/
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/args.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/args/tests.rs
@@ -1448,6 +1485,7 @@ lib/rustlib/src/rust/library/std/src/sys/pal/windows/c.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/c/README.md
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/c/bindings.txt
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/c/windows_sys.rs
+lib/rustlib/src/rust/library/std/src/sys/pal/windows/c/windows_targets.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/compat.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/fs.rs
@@ -1472,11 +1510,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/windows/stdio/
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/stdio/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_dtor.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_key/
-lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_key.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_key/tests.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_parking.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/windows/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/alloc.rs
@@ -1490,8 +1523,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/xous/net/udp.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/stdio.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread_local_key.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread_parking.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/xous/time.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/
 lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/abi.rs
@@ -1501,7 +1532,6 @@ lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/env.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/os.rs
 lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/stdio.rs
-lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/thread_local_key.rs
 lib/rustlib/src/rust/library/std/src/sys/path/
 lib/rustlib/src/rust/library/std/src/sys/path/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/path/sgx.rs
@@ -1550,20 +1580,41 @@ lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/futex.rs
 lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/mod.rs
 lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/no_threads.rs
 lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/queue.rs
-lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/sgx/
-lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/sgx.rs
-lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/sgx/tests.rs
 lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/solid.rs
 lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/teeos.rs
-lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/windows7.rs
-lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/xous.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/darwin.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/futex.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/id.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/mod.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/pthread.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/unsupported.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/windows7.rs
+lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/xous.rs
 lib/rustlib/src/rust/library/std/src/sys/thread_local/
-lib/rustlib/src/rust/library/std/src/sys/thread_local/fast_local.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/destructors/
+lib/rustlib/src/rust/library/std/src/sys/thread_local/destructors/linux_like.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/destructors/list.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/guard/
+lib/rustlib/src/rust/library/std/src/sys/thread_local/guard/apple.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/guard/key.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/guard/solid.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/guard/windows.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/racy.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/sgx.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/tests.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/unix.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/windows.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/key/xous.rs
 lib/rustlib/src/rust/library/std/src/sys/thread_local/mod.rs
-lib/rustlib/src/rust/library/std/src/sys/thread_local/os_local.rs
-lib/rustlib/src/rust/library/std/src/sys/thread_local/static_local.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/native/
+lib/rustlib/src/rust/library/std/src/sys/thread_local/native/eager.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/native/lazy.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/native/mod.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/os.rs
+lib/rustlib/src/rust/library/std/src/sys/thread_local/statik.rs
 lib/rustlib/src/rust/library/std/src/sys_common/
-lib/rustlib/src/rust/library/std/src/sys_common/backtrace.rs
 lib/rustlib/src/rust/library/std/src/sys_common/fs.rs
 lib/rustlib/src/rust/library/std/src/sys_common/io.rs
 lib/rustlib/src/rust/library/std/src/sys_common/lazy_box.rs
@@ -1573,16 +1624,6 @@ lib/rustlib/src/rust/library/std/src/sys_common/net.rs
 lib/rustlib/src/rust/library/std/src/sys_common/net/tests.rs
 lib/rustlib/src/rust/library/std/src/sys_common/process.rs
 lib/rustlib/src/rust/library/std/src/sys_common/tests.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_info.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_local_dtor.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key/
-lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key/tests.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/
-lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/futex.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/id.rs
-lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/mod.rs
 lib/rustlib/src/rust/library/std/src/sys_common/wstr.rs
 lib/rustlib/src/rust/library/std/src/sys_common/wtf8/
 lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs
@@ -1599,14 +1640,24 @@ lib/rustlib/src/rust/library/std/src/time/
 lib/rustlib/src/rust/library/std/src/time.rs
 lib/rustlib/src/rust/library/std/src/time/tests.rs
 lib/rustlib/src/rust/library/std/tests/
+lib/rustlib/src/rust/library/std/tests/builtin-clone.rs
 lib/rustlib/src/rust/library/std/tests/common/
 lib/rustlib/src/rust/library/std/tests/common/mod.rs
 lib/rustlib/src/rust/library/std/tests/create_dir_all_bare.rs
 lib/rustlib/src/rust/library/std/tests/env.rs
+lib/rustlib/src/rust/library/std/tests/eq-multidispatch.rs
+lib/rustlib/src/rust/library/std/tests/istr.rs
+lib/rustlib/src/rust/library/std/tests/log-knows-the-names-of-variants-in-std.rs
+lib/rustlib/src/rust/library/std/tests/minmax-stability-issue-23687.rs
 lib/rustlib/src/rust/library/std/tests/process_spawning.rs
 lib/rustlib/src/rust/library/std/tests/run-time-detect.rs
+lib/rustlib/src/rust/library/std/tests/seq-compare.rs
+lib/rustlib/src/rust/library/std/tests/slice-from-array-issue-113238.rs
 lib/rustlib/src/rust/library/std/tests/switch-stdout.rs
 lib/rustlib/src/rust/library/std/tests/thread.rs
+lib/rustlib/src/rust/library/std/tests/type-name-unsized.rs
+lib/rustlib/src/rust/library/std/tests/volatile-fat-ptr.rs
+lib/rustlib/src/rust/library/std/tests/windows.rs
 lib/rustlib/src/rust/library/stdarch/
 lib/rustlib/src/rust/library/stdarch/.cirrus.yml
 lib/rustlib/src/rust/library/stdarch/.github/
@@ -1649,8 +1700,8 @@ lib/rustlib/src/rust/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/
 lib/rustlib/src/rust/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
 lib/rustlib/src/rust/library/stdarch/ci/docker/s390x-unknown-linux-gnu/
 lib/rustlib/src/rust/library/stdarch/ci/docker/s390x-unknown-linux-gnu/Dockerfile
-lib/rustlib/src/rust/library/stdarch/ci/docker/wasm32-wasi/
-lib/rustlib/src/rust/library/stdarch/ci/docker/wasm32-wasi/Dockerfile
+lib/rustlib/src/rust/library/stdarch/ci/docker/wasm32-wasip1/
+lib/rustlib/src/rust/library/stdarch/ci/docker/wasm32-wasip1/Dockerfile
 lib/rustlib/src/rust/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/
 lib/rustlib/src/rust/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/
 lib/rustlib/src/rust/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
@@ -1674,6 +1725,7 @@ lib/rustlib/src/rust/library/stdarch/crates/core_arch/MISSING.md
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/README.md
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512bw.md
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512f.md
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/build.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/rustfmt.toml
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/
@@ -1711,6 +1763,18 @@ lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/table_
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/test_support.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/core_arch_docs.md
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/lib.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lasx/
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lasx/generated.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lasx/mod.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lasx/tests.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lasx/types.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lsx/
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lsx/generated.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lsx/mod.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lsx/tests.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/lsx/types.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/loongarch64/mod.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/macros.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/mips/
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/mips/mod.rs
@@ -1725,6 +1789,7 @@ lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/powerpc/mod.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/powerpc/vsx.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/powerpc64/
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/powerpc64/mod.rs
+lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/powerpc64/vsx.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv32/
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv32/mod.rs
 lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv32/zk.rs
@@ -1873,12 +1938,21 @@ lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/
 lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/cpu-detection.rs
 lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs
 lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/x86-specific.rs
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/Cargo.toml
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/README.md
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/neon.spec
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/src/
-lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen/src/main.rs
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/Cargo.toml
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/README.md
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/neon.spec
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/src/
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-arm/src/main.rs
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/Cargo.toml
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/README.md
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/lasx.spec
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/lasxintrin.h
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/lsx.spec
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/lsxintrin.h
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/src/
+lib/rustlib/src/rust/library/stdarch/crates/stdarch-gen-loongarch/src/main.rs
 lib/rustlib/src/rust/library/stdarch/crates/stdarch-test/
 lib/rustlib/src/rust/library/stdarch/crates/stdarch-test/Cargo.toml
 lib/rustlib/src/rust/library/stdarch/crates/stdarch-test/src/
diff --git a/lang/rust/rust.port.mk b/lang/rust/rust.port.mk
index 44fc6c24e..35b4b2120 100644
--- a/lang/rust/rust.port.mk
+++ b/lang/rust/rust.port.mk
@@ -1,6 +1,6 @@
 # increment after rust compiler update to trigger updates of
 # all compiled rust packages (see arch-defines.mk)
-_SYSTEM_VERSION-rust =	4
+_SYSTEM_VERSION-rust =	8
 
 CATEGORIES +=		lang/rust