From 691450915166bb069ab06616ff5d333231e75ef6 Mon Sep 17 00:00:00 2001
From: he <he@pkgsrc.org>
Date: Mon, 10 Jul 2023 12:01:24 +0000
Subject: [PATCH] rust: Upgrade to version 1.70.0.

Pkgsrc changes:
 * Adjust patches and cargo checksums to new versions.
 * Add support for NetBSD/riscv64.

Upstream changes:

Version 1.70.0 (2023-06-01)
==========================

Language
--------
- [Relax ordering rules for `asm!` operands]
  (https://github.com/rust-lang/rust/pull/105798/)
- [Properly allow macro expanded `format_args` invocations to uses captures]
  (https://github.com/rust-lang/rust/pull/106505/)
- [Lint ambiguous glob re-exports]
  (https://github.com/rust-lang/rust/pull/107880/)
- [Perform const and unsafe checking for expressions in `let _ =
  expr` position.]
  (https://github.com/rust-lang/rust/pull/102256/)

Compiler
--------
- [Extend -Cdebuginfo with new options and named aliases]
  (https://github.com/rust-lang/rust/pull/109808/)
  This provides a smaller version of debuginfo for cases that only
  need line number information (`-Cdebuginfo=line-tables-only`),
  which may eventually become the default for `-Cdebuginfo=1`.
- [Make `unused_allocation` lint against `Box::new` too]
  (https://github.com/rust-lang/rust/pull/104363/)
- [Detect uninhabited types early in const eval]
  (https://github.com/rust-lang/rust/pull/109435/)
- [Switch to LLD as default linker for {arm,thumb}v4t-none-eabi]
  (https://github.com/rust-lang/rust/pull/109721/)
- [Add tier 3 target `loongarch64-unknown-linux-gnu`]
  (https://github.com/rust-lang/rust/pull/96971)
- [Add tier 3 target for `i586-pc-nto-qnx700`(QNX Neutrino RTOS, version 7.0)]
  (https://github.com/rust-lang/rust/pull/109173/),
- [Insert alignment checks for pointer dereferences as debug assertions]
  (https://github.com/rust-lang/rust/pull/98112)
  This catches undefined behavior at runtime, and may cause existing
  code to fail.

Refer to Rust's [platform support page][platform-support-doc]
for more information on Rust's tiered platform support.

Libraries
---------
- [Document NonZeroXxx layout guarantees]
  (https://github.com/rust-lang/rust/pull/94786/)
- [Windows: make `Command` prefer non-verbatim paths]
  (https://github.com/rust-lang/rust/pull/96391/)
- [Implement Default for some alloc/core iterators]
  (https://github.com/rust-lang/rust/pull/99929/)
- [Fix handling of trailing bare CR in str::lines]
  (https://github.com/rust-lang/rust/pull/100311/)
- [allow negative numeric literals in `concat!`]
  (https://github.com/rust-lang/rust/pull/106844/)
- [Add documentation about the memory layout of `Cell`]
  (https://github.com/rust-lang/rust/pull/106921/)
- [Use `partial_cmp` to implement tuple `lt`/`le`/`ge`/`gt`]
  (https://github.com/rust-lang/rust/pull/108157/)
- [Stabilize `atomic_as_ptr`]
  (https://github.com/rust-lang/rust/pull/108419/)
- [Stabilize `nonnull_slice_from_raw_parts`]
  (https://github.com/rust-lang/rust/pull/97506/)
- [Partial stabilization of `once_cell`]
  (https://github.com/rust-lang/rust/pull/105587/)
- [Stabilize `nonzero_min_max`]
  (https://github.com/rust-lang/rust/pull/106633/)
- [Flatten/inline format_args!() and (string and int) literal
  arguments into format_args!()]
  (https://github.com/rust-lang/rust/pull/106824/)
- [Stabilize movbe target feature]
  (https://github.com/rust-lang/rust/pull/107711/)
- [don't splice from files into pipes in io::copy]
  (https://github.com/rust-lang/rust/pull/108283/)
- [Add a builtin unstable `FnPtr` trait that is implemented for
  all function pointers]
  (https://github.com/rust-lang/rust/pull/108080/)
  This extends `Debug`, `Pointer`, `Hash`, `PartialEq`, `Eq`,
  `PartialOrd`, and `Ord` implementations for function pointers
  with all ABIs.


Stabilized APIs
---------------

- [`NonZero*::MIN/MAX`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroI8.html#associatedconstant.MIN)
- [`BinaryHeap::retain`]
  (https://doc.rust-lang.org/stable/std/collections/struct.BinaryHeap.html#method.retain)
- [`Default for std::collections::binary_heap::IntoIter`]
  (https://doc.rust-lang.org/stable/std/collections/binary_heap/struct.IntoIter.html)
- [`Default for std::collections::btree_map::{IntoIter, Iter, IterMut}`]
  (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoIter.html)
- [`Default for std::collections::btree_map::{IntoKeys, Keys}`]
  (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html)
- [`Default for std::collections::btree_map::{IntoValues, Values}`]
  (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html)
- [`Default for std::collections::btree_map::Range`]
  (https://doc.rust-lang.org/stable/std/collections/btree_map/struct.Range.html)
- [`Default for std::collections::btree_set::{IntoIter, Iter}`]
  (https://doc.rust-lang.org/stable/std/collections/btree_set/struct.IntoIter.html)
- [`Default for std::collections::btree_set::Range`]
  (https://doc.rust-lang.org/stable/std/collections/btree_set/struct.Range.html)
- [`Default for std::collections::linked_list::{IntoIter, Iter, IterMut}`]
  (https://doc.rust-lang.org/stable/alloc/collections/linked_list/struct.IntoIter.html)
- [`Default for std::vec::IntoIter`]
  (https://doc.rust-lang.org/stable/alloc/vec/struct.IntoIter.html#impl-Default-for-IntoIter%3CT,+A%3E)
- [`Default for std::iter::Chain`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Chain.html)
- [`Default for std::iter::Cloned`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Cloned.html)
- [`Default for std::iter::Copied`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Copied.html)
- [`Default for std::iter::Enumerate`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Enumerate.html)
- [`Default for std::iter::Flatten`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Flatten.html)
- [`Default for std::iter::Fuse`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Fuse.html)
- [`Default for std::iter::Rev`]
  (https://doc.rust-lang.org/stable/std/iter/struct.Rev.html)
- [`Default for std::slice::Iter`]
  (https://doc.rust-lang.org/stable/std/slice/struct.Iter.html)
- [`Default for std::slice::IterMut`]
  (https://doc.rust-lang.org/stable/std/slice/struct.IterMut.html)
- [`Rc::into_inner`]
  (https://doc.rust-lang.org/stable/alloc/rc/struct.Rc.html#method.into_inner)
- [`Arc::into_inner`]
  (https://doc.rust-lang.org/stable/alloc/sync/struct.Arc.html#method.into_inner)
- [`std::cell::OnceCell`]
  (https://doc.rust-lang.org/stable/std/cell/struct.OnceCell.html)
- [`Option::is_some_and`]
  (https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.is_some_and)
- [`NonNull::slice_from_raw_parts`]
  (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.slice_from_raw_parts)
- [`Result::is_ok_and`]
  (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.is_ok_and)
- [`Result::is_err_and`]
  (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.is_err_and)
- [`std::sync::atomic::Atomic*::as_ptr`]
  (https://doc.rust-lang.org/stable/std/sync/atomic/struct.AtomicU8.html#method.as_ptr)
- [`std::io::IsTerminal`]
  (https://doc.rust-lang.org/stable/std/io/trait.IsTerminal.html)
- [`std::os::linux::net::SocketAddrExt`]
  (https://doc.rust-lang.org/stable/std/os/linux/net/trait.SocketAddrExt.html)
- [`std::os::unix::net::UnixDatagram::bind_addr`]
  (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.bind_addr)
- [`std::os::unix::net::UnixDatagram::connect_addr`]
  (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.connect_addr)
- [`std::os::unix::net::UnixDatagram::send_to_addr`]
  (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixDatagram.html#method.send_to_addr)
- [`std::os::unix::net::UnixListener::bind_addr`]
  (https://doc.rust-lang.org/stable/std/os/unix/net/struct.UnixListener.html#method.bind_addr)
- [`std::path::Path::as_mut_os_str`]
  (https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.as_mut_os_str)
- [`std::sync::OnceLock`]
  (https://doc.rust-lang.org/stable/std/sync/struct.OnceLock.html)

Cargo
-----

- [Add `CARGO_PKG_README`]
  (https://github.com/rust-lang/cargo/pull/11645/)
- [Make `sparse` the default protocol for crates.io]
  (https://github.com/rust-lang/cargo/pull/11791/)
- [Accurately show status when downgrading dependencies]
  (https://github.com/rust-lang/cargo/pull/11839/)
- [Use registry.default for login/logout]
  (https://github.com/rust-lang/cargo/pull/11949/)
- [Stabilize `cargo logout`]
  (https://github.com/rust-lang/cargo/pull/11950/)

Misc
----

- [Stabilize rustdoc `--test-run-directory`]
  (https://github.com/rust-lang/rust/pull/103682/)

Compatibility Notes
-------------------

- [Prevent stable `libtest` from supporting `-Zunstable-options`]
  (https://github.com/rust-lang/rust/pull/109044/)
- [Perform const and unsafe checking for expressions in `let _ =
  expr` position.]
  (https://github.com/rust-lang/rust/pull/102256/)
- [WebAssembly targets enable `sign-ext` and `mutable-globals`
  features in codegen]
  (https://github.com/rust-lang/rust/issues/109807)
  This may cause incompatibility with older execution environments.
- [Insert alignment checks for pointer dereferences as debug assertions]
  (https://github.com/rust-lang/rust/pull/98112)
  This catches undefined behavior at runtime, and may cause existing
  code to fail.

Internal Changes
----------------

These changes do not affect any public interfaces of Rust, but they represent
significant improvements to the performance or internals of rustc and related
tools.

- [Upgrade to LLVM 16]
  (https://github.com/rust-lang/rust/pull/109474/)
- [Use SipHash-1-3 instead of SipHash-2-4 for StableHasher]
  (https://github.com/rust-lang/rust/pull/107925/)
---
 lang/rust/Makefile                            | 109 ++++----
 lang/rust/cross.mk                            |   6 +-
 lang/rust/distinfo                            | 263 +++++++++---------
 lang/rust/do-cross.mk                         |  12 +-
 ...tch-compiler_rustc__target_src_spec_mod.rs |   8 +-
 ...get_src_spec_riscv64gc__unknown__netbsd.rs |  26 ++
 .../patches/patch-library_core_src_ffi_mod.rs |  20 ++
 .../patches/patch-src_bootstrap_install.rs    |  24 --
 lang/rust/patches/patch-src_bootstrap_llvm.rs |  15 +
 .../patches/patch-vendor_cc-1.0.73_src_lib.rs |  16 ++
 .../patches/patch-vendor_cc-1.0.77_src_lib.rs |  16 ++
 lang/rust/patches/patch-vendor_cc_src_lib.rs  |  26 +-
 ....138_src_unix_bsd_netbsdlike_netbsd_mod.rs |  12 +-
 ..._src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  31 +++
 ...39_src_unix_bsd_netbsdlike_netbsd_mips.rs} |   6 +-
 ...139_src_unix_bsd_netbsdlike_netbsd_mod.rs} |  16 +-
 ..._src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  31 +++
 ...libc_src_unix_bsd_netbsdlike_netbsd_mod.rs |  10 +-
 ..._src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  31 +++
 .../patch-vendor_openssl-src_src_lib.rs       |   7 +-
 .../patch-vendor_openssl-sys_build_main.rs    |  16 +-
 ...patch-vendor_target-lexicon_src_targets.rs |  16 +-
 22 files changed, 470 insertions(+), 247 deletions(-)
 create mode 100644 lang/rust/patches/patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs
 create mode 100644 lang/rust/patches/patch-library_core_src_ffi_mod.rs
 delete mode 100644 lang/rust/patches/patch-src_bootstrap_install.rs
 create mode 100644 lang/rust/patches/patch-src_bootstrap_llvm.rs
 create mode 100644 lang/rust/patches/patch-vendor_cc-1.0.73_src_lib.rs
 create mode 100644 lang/rust/patches/patch-vendor_cc-1.0.77_src_lib.rs
 create mode 100644 lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
 rename lang/rust/patches/{patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs => patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs} (76%)
 rename lang/rust/patches/{patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs => patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs} (72%)
 create mode 100644 lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
 create mode 100644 lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 3ff2b8621aae..ff1abff1ea47 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.286 2023/07/03 20:38:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.287 2023/07/10 12:01:24 he Exp $
 
-DISTNAME=	rustc-1.69.0-src
+DISTNAME=	rustc-1.70.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
@@ -12,11 +12,11 @@ LICENSE=	mit OR apache-2.0
 
 CONFLICTS+=	rust-bin-[0-9]*
 
-# LLVM uses gcc7, follow suit.  Also, uses -std=c++14
+# LLVM requires gcc7, follow suit.  Also, uses -std=c++17
 GCC_REQD+=	7
 
 USE_GCC_RUNTIME=	yes
-USE_LANGUAGES=		c c++11
+USE_LANGUAGES=		c c++17
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bash grep gmake perl:build pkg-config
 
@@ -68,9 +68,7 @@ MAKE_ENV+=		CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 # that any conflicting packages pulled in via dependencies are not buildlinked.
 BUILDLINK_FILES_CMD.libssh2=	${TRUE}
 BUILDLINK_FILES_CMD.xz=		${TRUE}
-
-# Use the bundled lzma.
-MAKE_ENV+=		LZMA_API_STATIC=1
+MAKE_ENV+=			LZMA_API_STATIC=1
 
 # MacOS X 10.7 is the oldest supported version. See
 # ${WRKSRC}/src/bootstrap/lib.rs
@@ -177,12 +175,8 @@ CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/dox.sh
 # PR is open for this.)  \todo Understand and fix.
 #
 # If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
-# \todo Consider avoiding setting this on netbsd-9 past the fix.
-# Release 9.x and 9.1 or later is OK
-.  if ${OPSYS} == "NetBSD" &&  090099 < ${OPSYS_VERSION} && ${OPSYS_VERSION} < 090900
-MAKE_JOBS_SAFE?=	yes
-.  endif
-.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099957
+# Release 9.x and 9.1 or later is OK.
+.  if ${OPSYS} == "NetBSD" && 090999 < ${OPSYS_VERSION} && ${OPSYS_VERSION} < 090900
 MAKE_JOBS_SAFE?=	no
 .  endif
 
@@ -217,49 +211,49 @@ BUILDLINK_TRANSFORM+=	opt:x86_64:arm64
 DISTFILES:=		${DEFAULT_DISTFILES}
 
 .if ${MACHINE_PLATFORM:MDarwin-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		aarch64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MDarwin-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MLinux-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		aarch64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MLinux-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		arm-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MLinux-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		armv7-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MLinux-*-i386} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MLinux-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -271,7 +265,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 # x86_64-sun-solaris bootstrap and comment out the overrides.
 #
 .if ${MACHINE_PLATFORM:MSunOS-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		x86_64-unknown-illumos
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -284,14 +278,14 @@ CONFIGURE_ARGS+=	--host=${RUST_ARCH}
 CONFIGURE_ARGS+=	--target=${RUST_ARCH}
 .endif
 .if ${MACHINE_PLATFORM:MFreeBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH=		i586-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -311,14 +305,14 @@ pre-build-fix-paxctl:
 	${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.68.2
+RUST_STAGE0_VER=	1.69.0
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
@@ -341,7 +335,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
 RUST_ARCH=			aarch64-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -350,7 +344,7 @@ SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
 RUST_ARCH=			aarch64_be-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -359,7 +353,7 @@ SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
 RUST_ARCH=			sparc64-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -369,7 +363,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=			armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -378,7 +372,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=			armv6-unknown-netbsd-eabihf
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -387,7 +381,16 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=			mipsel-unknown-netbsd
-RUST_STAGE0_VER=		1.68.2
+RUST_STAGE0_VER=		1.69.0
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
+SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
+SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
+.endif
+.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
+RUST_ARCH=			riscv64gc-unknown-netbsd
+RUST_STAGE0_VER=		1.70.0
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -426,21 +429,23 @@ SUBST_VARS.rpath=	PREFIX
 # updating and verification.
 #
 
-#CKSUM_CRATES+=	vendor/cc
-#CKSUMS+=	2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
-#CKSUMS+=	a8e8ff94141ffd6760f10e9359a206badc792ce068f3fed8a5b5e06ebe9a72a4
+CKSUM_CRATES+=	vendor/cc-1.0.73
+CKSUMS+=	38970d678de0efb4b5e2978265daa8a613a1db35fc42e669621b03fc56d5b138
+CKSUMS+=	65de0d6593a4256e5fcaf898f9468d71bab672c70a2dfab3dcb8514e9b72819c
 
-CKSUM_CRATES+=	vendor/libc
-CKSUMS+=	b1c0a1d347b30d45c85429b7236d234f5b2c86b9eec439e897c9371d856c187a
-CKSUMS+=	280468ba8d1efca96895eed707a72ec577aef65ac15b10caca0b3124504d9f11
-CKSUMS+=	107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
-CKSUMS+=	62169589a535636bee360c767d8014c63ba2042e4d7d3078b118987947b194b8
+CKSUM_CRATES+=	vendor/cc-1.0.77
+CKSUMS+=	2403bbe39ff511ea5a517c0841d825173a4fdc8a0899c64282bba49127f0dc33
+CKSUMS+=	2b7150f466b9e0617b2c3755450db2090232f27561687d462b0a8ac0518fce87
 
-CKSUM_CRATES+=	vendor/libc-0.2.137
-CKSUMS+=	77009c0e2e06abf8e81634bb65c22a0ccf9564a7cc64cee62d08b8ea716b8cac
-CKSUMS+=	fe5911a550e975c2df8ccb96f1195e41f5286609afb53f4a3d28bf7c63b6031c
+CKSUM_CRATES+=	vendor/libc
+CKSUMS+=	6442ed05eb390d44a03daa9800af1030f2ee3e61db98675262c227b28de51937
+CKSUMS+=	ec554c837999c718786debfcfe2241984193751fcd52156323b418d96319aa95
+CKSUMS+=	4493317993af390d8aafc2cb7ace4c349dfc9d2451fd666844f04a4fa1f47442
+CKSUMS+=	e5414483c02597e67a0aa27db7501f1a98c43ffee0151aa320586dded51f41cb
 
-#CKSUM_CRATES+=	vendor/libc-0.2.138
+CKSUM_CRATES+=	vendor/libc-0.2.139
+CKSUMS+=	107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
+CKSUMS+=	4be83bef456569d59405edf134e7fe8eff78f3fe35f1efd60e15405d5c822725
 
 CKSUM_CRATES+=	vendor/lzma-sys
 CKSUMS+=	6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@@ -450,10 +455,6 @@ CKSUM_CRATES+=	vendor/stacker
 CKSUMS+=	59ca847887cf19387119d18c57f08d5a8520d714876ca0142b8f1c001ecde06b
 CKSUMS+=	03be8ae293b713fe6e9703e4809dd68caaec992bae6777914ffddae8da2a9bc7
 
-#CKSUM_CRATES+=	vendor/kqueue
-#CKSUMS+=	900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
-#CKSUMS+=	9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
-
 CKSUM_CRATES+=	vendor/crossbeam-epoch
 CKSUM_CRATES+=	vendor/crossbeam-utils
 CKSUMS+=	3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
@@ -462,14 +463,16 @@ CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
 CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
 
 CKSUM_CRATES+=	vendor/openssl-src
-CKSUMS+=	40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
-CKSUMS+=	f358adc7b69c478ca89a96505f9a28f51cc6ad481bcdd304d5089e112c0904db
-CKSUMS+=	b3c59089fa4151eb978a55f17e2adff6ceb752d579b64962336b49cefe41776b
-CKSUMS+=	db49cdc41015692a4dd2076a33d694c3371a6720db176742cb6c509d533a1fcd
+CKSUMS+=	090744f85cf99a9b8412c23fca1eabb61eb45d830f0f9f0e7309be2572c1e827
+CKSUMS+=	4261f87c06e6505afd9f7bdafe5aebdd153a1c6f928203cec2dd125642d60fc1
+CKSUMS+=	9aeed598f844ca5b63cf222052b44fc643d6cb47a879c286b46c34bbbba618df
+CKSUMS+=	20ce1c7048d0f1168a5a00e7608c8da2205a6bbdd906f69c1f5a0e6e173db8ea
 
 CKSUM_CRATES+=	vendor/openssl-sys
-CKSUMS+=	d397af804c0b786978867528635fa9148cd2ad0e6abd591ace21b5bd3719c38d
-CKSUMS+=	246d1f71852a08745fba8d00f126d2bd7816c9428d568a0d5e4907e69548ab9b
+CKSUMS+=	d04538b63898180949bc7d9ced4806395011a3f6c5d374d4ebfdf2b30cd9cc33
+CKSUMS+=	5972bc8c1549820108b53df23ee1a9fb7c3d40c2c198a855a5afdf563cbafb26
+CKSUMS+=	1f9233e5993c3537767d39b66fa5a43f5268a9bf89b70884886652cfa7e869c6
+CKSUMS+=	93dd56b8ea8c24678cf390232a1de7bbf0de64a5eaa40da95848e22e611c6dcb
 CKSUMS+=	5b3f48d529657f212e69883f9d3f599d0e1fc9a64f1389cc3760029b4ad6a423
 CKSUMS+=	ab6b0ec78a2eefeaf0fc5f45afa783fa254d5efe856401c0b34d4d05ef9b3dd4
 
diff --git a/lang/rust/cross.mk b/lang/rust/cross.mk
index ff4c506c8dbd..3116278f445a 100644
--- a/lang/rust/cross.mk
+++ b/lang/rust/cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.10 2023/01/23 18:49:03 he Exp $
+# $NetBSD: cross.mk,v 1.11 2023/07/10 12:01:24 he Exp $
 
 # These settings may be used to cross-build rust.
 #
@@ -16,11 +16,11 @@
 #CROSS_ROOT=		/u/evbarm-armv6hf
 #CROSS_ROOT=		/u/sparc64
 #CROSS_ROOT=		/u/macppc
-#CROSS_ROOT=		/u/9.0-macppc
 #CROSS_ROOT=		/u/evbarm64
 #CROSS_ROOT=		/u/evbarm64eb
 #CROSS_ROOT=		/u/i386
 #CROSS_ROOT=		/u/mipsel
+#CROSS_ROOT=		/u/riscv64
 #CROSS_ROOT=		/
 #MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 
@@ -33,6 +33,7 @@
 #GNU_CROSS_TARGET=	aarch64_be--netbsd
 #GNU_CROSS_TARGET=	i486--netbsdelf
 #GNU_CROSS_TARGET=	mipsel--netbsd
+#GNU_CROSS_TARGET=	riscv64--netbsd
 #MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
 
 # To cross-build rust, you need to specify
@@ -48,6 +49,7 @@
 #TARGET=		i686-unknown-netbsd
 #TARGET=		i586-unknown-netbsd
 #TARGET=		mipsel-unknown-netbsd
+#TARGET=		riscv64gc-unknown-netbsd
 #
 #SCRIPTS=		${WRKDIR}/scripts
 #CONFIGURE_ARGS+=	--host=${TARGET}
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index eec38a4955a7..2a08d217eafb 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,137 +1,145 @@
-$NetBSD: distinfo,v 1.159 2023/06/19 14:46:47 bsiegert Exp $
+$NetBSD: distinfo,v 1.160 2023/07/10 12:01:24 he Exp $
 
-BLAKE2s (rust-1.68.2-aarch64-apple-darwin.tar.gz) = 2ce1385b1966325074f41065a834f57621c641335ccc1b011543deaa15758430
-SHA512 (rust-1.68.2-aarch64-apple-darwin.tar.gz) = 9525012c5fd8f2fcf498b79b698a74655a4520c18d369762acfdd7e7eb899e0793ce620630a18fc4a0840f0b7faa6e5e082398ec0c41967199f3344c6a8bc3ef
-Size (rust-1.68.2-aarch64-apple-darwin.tar.gz) = 241691250 bytes
-BLAKE2s (rust-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = 16efd7f8b15ad4e3635d23a9c64ede37e5b7beaacab6dc88f1ba177bc6b5efbd
-SHA512 (rust-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = 9868aed17badf7449377181db9981a4dec24aaf23731ecf4cc9e4f3b9830aac75330d6bf572fd4d25f4768f94557218bd34b8865d880b451a15d6bce48ceb8ae
-Size (rust-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = 451354348 bytes
-BLAKE2s (rust-1.68.2-aarch64-unknown-netbsd.tar.xz) = 8aa0ef15a636663b5ec59476dbdb6bc74f68803ee3b0566f516afb76eb42e31a
-SHA512 (rust-1.68.2-aarch64-unknown-netbsd.tar.xz) = 993187ce577834784a9c9a55294c22dab4302256b6f320c042fe6c47c99b727147b71dc7261ef2a981f19ddbfc59301cf2f48ebb82cf54284740b7590d153d91
-Size (rust-1.68.2-aarch64-unknown-netbsd.tar.xz) = 160923372 bytes
-BLAKE2s (rust-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = fdcc5e2da6353770ece3ee400142dc9a70ea5394631c0e1a82e781a2e2a5eae8
-SHA512 (rust-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = cc79fbeea37a240d5ad5d325e0edff857bf7cf26653d5cf1cff27ca5030f58f581c864bfc2a245378416e4853c8284e42a20ebfe8f8ff83881af2c2a1a91e30e
-Size (rust-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = 160831656 bytes
-BLAKE2s (rust-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = 5519dd5c62d5fcb9be487d2ce69e11871ea2fcf2c60cd54bea8001a3fdbc3a19
-SHA512 (rust-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = c699d92333897cd7cbb25358b5f0c1455ccf9565509db9768b8ca3fece071f705c4bf64e3bcfc4d7f19599e2758e6b1ee6d6440c4a0875b37d897664c1fd8379
-Size (rust-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = 343477491 bytes
-BLAKE2s (rust-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = f777639f9f9e1144b6467e6ad6ac051bcc77b940b060a1e158d45c3bf0ef7aaf
-SHA512 (rust-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = a11f5b6cee534dce900bd5f6777bb567fcfb91ec9fbd8de68e649a601a6582a3be52f277aa6e87e6db8db4f07c2370d1cc865af3562947c748791d080af1f8bc
-Size (rust-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = 139630864 bytes
-BLAKE2s (rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = af43bea36d249c04377f9179a9f9fe2fbfc928bc47efcafb2be268528d1744db
-SHA512 (rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = b4822812b9dbef0e42e4ae2f8d2e41544565453f9f4dadf97d2aea5480cc3d2642d15a338637a42340015da0265636d6201ae546e38b29a1d6fb92f27a87f7da
-Size (rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = 334059557 bytes
-BLAKE2s (rust-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = 612f27d88006d79ce9d2325c7013accd02c371676681234be440073447c07d9f
-SHA512 (rust-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = 93b7e1553daf204100b6a585231389b72b182e88c879c32660c0bd0512c0f10e156c95fa088677eea323a07dcf40e5630ff3d7419a20595b462c50b58e868d8e
-Size (rust-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = 137854436 bytes
-BLAKE2s (rust-1.68.2-i586-unknown-netbsd.tar.xz) = 2373708734613809b3b160093d943e62ef20827dd9b9400fa000753d3b5202aa
-SHA512 (rust-1.68.2-i586-unknown-netbsd.tar.xz) = daa4f603ff916774f73725ce989124ba35bfb935c21e382053f4259a759c875f4b9b2ae12c53dcf8781dc76a23366c98280aa2d77599b9cbd5ade473c543b896
-Size (rust-1.68.2-i586-unknown-netbsd.tar.xz) = 173863164 bytes
-BLAKE2s (rust-1.68.2-i686-unknown-linux-gnu.tar.gz) = d74b7c9c663c9858ba5a2cb2de1c437740f6630dfcc84f62ae84a246e1267b95
-SHA512 (rust-1.68.2-i686-unknown-linux-gnu.tar.gz) = 75b23c215a88946eff672fe4ba9d7d0174a2a699b72ab46483d6e9f93bdba04c6a7991505d3f30a77c765a4affc017463d0a598461407bdf51479b23f9d5c30a
-Size (rust-1.68.2-i686-unknown-linux-gnu.tar.gz) = 401355176 bytes
-BLAKE2s (rust-1.68.2-mipsel-unknown-netbsd.tar.xz) = 6f9c2d6a2756e3b73c3ca1649ea01465d5eb263bdd932969d83167eea2f474c5
-SHA512 (rust-1.68.2-mipsel-unknown-netbsd.tar.xz) = 23b6307208e633793a1b98c804db49ac7927c23a5f971d84da2c1c5984cd5642fd1569fe317b6d25545cbbf3207c32ac37f47e443b66c3274fc1cf93d8b030b2
-Size (rust-1.68.2-mipsel-unknown-netbsd.tar.xz) = 138970628 bytes
-BLAKE2s (rust-1.68.2-powerpc-unknown-netbsd.tar.xz) = c3b46e7dd66fff0d543848e8cd802549eaf6b95f99832df196c68fd3029ff861
-SHA512 (rust-1.68.2-powerpc-unknown-netbsd.tar.xz) = 3f77b8bebcc5692cf698507c28285d724b93765d684f2cadf363481a25b7273d00d9583a9f1647d213c83d268d20d93fbfbc29aa89f919ec2e028c6cc934e3e3
-Size (rust-1.68.2-powerpc-unknown-netbsd.tar.xz) = 182826940 bytes
-BLAKE2s (rust-1.68.2-powerpc-unknown-netbsd90.tar.xz) = 99ea3e35b70ff85d80de36611d3483fb0b2d17dced80be4b6b23a20e13423de7
-SHA512 (rust-1.68.2-powerpc-unknown-netbsd90.tar.xz) = 364cde46fadeb26f96ae346e126f86acea7eb19af2edd3ced08c0831eb814553382a064cff6231f47f8b002b85f0094cbe378f958f970938dc5eadd671ec6275
-Size (rust-1.68.2-powerpc-unknown-netbsd90.tar.xz) = 183686480 bytes
-BLAKE2s (rust-1.68.2-sparc64-unknown-netbsd.tar.xz) = 532c7145dc06b6c34b0c02dd9ce7560d5a0a7a1fd535567fdf4996455d7c3f2b
-SHA512 (rust-1.68.2-sparc64-unknown-netbsd.tar.xz) = e5cd3f8b5af71829f9f80052b419a1ed868dba6d8cc9611a6de026400386c66a9d6d2ff8bea642c1d1ff148ae0f19ad8045ec6694041db3296db2d823f068d93
-Size (rust-1.68.2-sparc64-unknown-netbsd.tar.xz) = 154392172 bytes
-BLAKE2s (rust-1.68.2-x86_64-apple-darwin.tar.gz) = 293a8cccb2707f66337593cad62492da3c82179d20537680f05abfae8874b88c
-SHA512 (rust-1.68.2-x86_64-apple-darwin.tar.gz) = f33a1f59aeae05c1f4ac9e477ff01dfcf32aa07728b92ae0767892adec5dc744e3f9d097bd77a07c619787d36011285e7a92271c4a4379da02c4ab9767e15e84
-Size (rust-1.68.2-x86_64-apple-darwin.tar.gz) = 325363849 bytes
-BLAKE2s (rust-1.68.2-x86_64-unknown-freebsd.tar.gz) = 86da64ad3f2af954491b4f166ab407eb0220b6fbca9bf402edb1cf0611d86c4d
-SHA512 (rust-1.68.2-x86_64-unknown-freebsd.tar.gz) = 0b4ab9aa0b32309a18a9b28bc91bbcae8ae7d3824614469adabfd504f6aecee5a468ccee6fa78751e00954ea6ba98c4e4ebc976bb6069e822fe393146bddd3ae
-Size (rust-1.68.2-x86_64-unknown-freebsd.tar.gz) = 310138545 bytes
-BLAKE2s (rust-1.68.2-x86_64-unknown-illumos.tar.gz) = e3c91704c4366e0db0fd073c3f7a1246fc856d2fee32a095041832f37fbd2bd2
-SHA512 (rust-1.68.2-x86_64-unknown-illumos.tar.gz) = c6326fce5d157cac6a57a28d3370dbc6fb393b9caf2dd628d30879673bba3b0bacf8de6dfe18577b3fa1fe1a0fd90ab48498c1f65fab3753cc7fd35e91cbb47b
-Size (rust-1.68.2-x86_64-unknown-illumos.tar.gz) = 224557906 bytes
-BLAKE2s (rust-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = ad8a1361317fa856dccac8c473ff0972490efe0413b711e76093ec7ef621c9ca
-SHA512 (rust-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = da206ed02046dff864e4884385e06b75bef243dab053437ee2227a167689cd397c1f0175a5511f90cfd0efe02cdfed26e9c9f89089851573437e827298e35c0b
-Size (rust-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = 322181574 bytes
-BLAKE2s (rust-1.68.2-x86_64-unknown-netbsd.tar.xz) = b9d527c5680558940e17c83ef301bca47bc26688cb3683e7b86ae715d9787af2
-SHA512 (rust-1.68.2-x86_64-unknown-netbsd.tar.xz) = 2c86c4c0cd4efac6bfebea3ee9c394bb149033b2d64801715acdd50c50a5c3911e3ac409323be748e92459732a36a5f1dce22fd64c2720d51bfef7dda81d6aec
-Size (rust-1.68.2-x86_64-unknown-netbsd.tar.xz) = 185369476 bytes
-BLAKE2s (rust-std-1.68.2-aarch64-apple-darwin.tar.gz) = 86b3a8e8ea99618696ed212ac03b35fc101a6cf32d4029cbab3d8337dba85e40
-SHA512 (rust-std-1.68.2-aarch64-apple-darwin.tar.gz) = dc7b414a660b8cee79a99e93d9f23900048764158871d8e5acd9b33fd818aa245afa33202adb3dba33e57391233440593cec961d532b91a2d389a1bcad905e61
-Size (rust-std-1.68.2-aarch64-apple-darwin.tar.gz) = 44021003 bytes
-BLAKE2s (rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = d49b31e7b055a96e63991fa62cff8ac0d0aaca40221a603f94c88361093e9fa1
-SHA512 (rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = 3279e98df9cb4cac3060be6d873ef69ccf023e92b75abd8cf7b73617e26921d8c59f1b1ecbedb4bcea7ce40eade5255c9d1f6bb6a7c50d45980e80da5b9d55b3
-Size (rust-std-1.68.2-aarch64-unknown-linux-gnu.tar.gz) = 66797015 bytes
-BLAKE2s (rust-std-1.68.2-aarch64-unknown-netbsd.tar.xz) = b4131ba4456a857a997d8a9e9a4e484f29c5db7efca84804121f20ededc6e18f
-SHA512 (rust-std-1.68.2-aarch64-unknown-netbsd.tar.xz) = 986fe995da48ac62122ae7afac922442b0241c505bac5072731e450244259885caa09532a149f31e84b3dfa5cd6ce97d86e944f54c6a695545b479966828099f
-Size (rust-std-1.68.2-aarch64-unknown-netbsd.tar.xz) = 25357056 bytes
-BLAKE2s (rust-std-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = f138d423115c7265a286d10ee1caff3875a1021d97d2c85744c9d6f5e6750e33
-SHA512 (rust-std-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = d439f20c461fa7636a61d3d8579b2a1788d3fbf58e714746886bf84c1952cb0689bd2185affe7049052f6a007975d83cf8799b13a71e06d2deba9ba698cf57e9
-Size (rust-std-1.68.2-aarch64_be-unknown-netbsd.tar.xz) = 25836560 bytes
-BLAKE2s (rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = 8600f273bc03505e5b19f52648d03c4de4739efb3b961259d9e5be560536a633
-SHA512 (rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = 1269269f4b7b8e09a3fe6a356b1979d5f640310cbc2d4c49ea6ce28fcd31b0515a098dab3e24526dba2900d08bf0218b57e37faa537410937a8a156b60883908
-Size (rust-std-1.68.2-arm-unknown-linux-gnueabihf.tar.gz) = 40265802 bytes
-BLAKE2s (rust-std-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = 6d0a9610b195e3d1ce726303667bd84999a4867159aa206f66e734a47615394e
-SHA512 (rust-std-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = 9f61fecd4b7e2bc904fedb440d1e1019fa46fbda95377f44e103eeb76b9c8d6107480fec316377b829a834a98c500ca1c2697e6a8fc519c27412eac58d283bf0
-Size (rust-std-1.68.2-armv6-unknown-netbsd-eabihf.tar.xz) = 23544148 bytes
-BLAKE2s (rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = 802f08d43a8490abcc0ae1209a2ad84335075a915f15a48aafe8b3e312cfd3c3
-SHA512 (rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = 0e36ebcee99752bb81cfd46f157e00a0eba7d4f96d08bddb30575e0db402df78d9429037568c55fd6d6305650f68b4ad459aacad5fdbb01521dea766a3b24e25
-Size (rust-std-1.68.2-armv7-unknown-linux-gnueabihf.tar.gz) = 41967419 bytes
-BLAKE2s (rust-std-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = e2a6bf5b857619336e161c70db6c5faa86c3087d384c312a74b2129fb57da1f8
-SHA512 (rust-std-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = 2616e7e2d80fda167bb28f6bcb0c6460d5b101f8f95359bbfa73051e5cc4d7c7589628667f74befc41e7a8382daeffd10fb6a9e0aa37caee9631d6c191b68723
-Size (rust-std-1.68.2-armv7-unknown-netbsd-eabihf.tar.xz) = 24571364 bytes
-BLAKE2s (rust-std-1.68.2-i586-unknown-netbsd.tar.xz) = cf15440395a0d812067301dd13d737c791ac31d698b921ba037b4d2a352cac7b
-SHA512 (rust-std-1.68.2-i586-unknown-netbsd.tar.xz) = 22fd72ed4863dd47d2948c2a70d3394d1255b24da4aa5623241cceca33ab03432ca0f649356522a500ce924fbe27b6a2151364c3e8f7a762dd68bd371c3ac05a
-Size (rust-std-1.68.2-i586-unknown-netbsd.tar.xz) = 25933444 bytes
-BLAKE2s (rust-std-1.68.2-i686-unknown-linux-gnu.tar.gz) = 2b7efdeadb02a96fa48afc9c64ef95b7c6b9affbe5ff8114504727f1a6623464
-SHA512 (rust-std-1.68.2-i686-unknown-linux-gnu.tar.gz) = e410258aff1052013a3628d565f1eac8d7d002033033a24a5df5596e27b128ae55aacdf5a61f4b7aadd3daf482a7fe8aa8f5ea78ddbbb9526451520a460a7459
-Size (rust-std-1.68.2-i686-unknown-linux-gnu.tar.gz) = 44626143 bytes
-BLAKE2s (rust-std-1.68.2-mipsel-unknown-netbsd.tar.xz) = b7e9bc254d409892145341f35349ce4c5b04ba782accd4f4a5f87b590d896229
-SHA512 (rust-std-1.68.2-mipsel-unknown-netbsd.tar.xz) = f3e1b111a12c75faaae7f270f00634f23285f84e1fa7b3b2928a6b9e587ff35de99ba75537d7ab2ef6a0711a77c7228d6fcc25bd6f044feea9e57ba0ab31658a
-Size (rust-std-1.68.2-mipsel-unknown-netbsd.tar.xz) = 23542836 bytes
-BLAKE2s (rust-std-1.68.2-powerpc-unknown-netbsd.tar.xz) = 9afc54da3bcbff857e015005c46c6a02fd390e4df593688ad968efcf47d41af0
-SHA512 (rust-std-1.68.2-powerpc-unknown-netbsd.tar.xz) = 6804ff84383195b39bfb5abe001f06240e34c80ad24061057c9539cff4c858e3a3bb3f03e8fdc08d914539ad3ea2b70cd7e51ddd1c7813c766b1431be95b9e63
-Size (rust-std-1.68.2-powerpc-unknown-netbsd.tar.xz) = 23435412 bytes
-BLAKE2s (rust-std-1.68.2-powerpc-unknown-netbsd90.tar.xz) = 5525472ef048b750566bffd26c33ff92cf1c81d0b6d48d37e5e0e01d8871c2b9
-SHA512 (rust-std-1.68.2-powerpc-unknown-netbsd90.tar.xz) = eb6254b0ec247739437e69db9e7c212f03cfe8e1a552178f7d8edb53051a60b5e3d65275c1dbf2fd6c20de23dfb1adf372fa7a026e7f270ef5311e05ba8aba33
-Size (rust-std-1.68.2-powerpc-unknown-netbsd90.tar.xz) = 23434636 bytes
-BLAKE2s (rust-std-1.68.2-sparc64-unknown-netbsd.tar.xz) = 8159322b766a30ab29d1a1fad84950967d62ef89d1b8f52954665c6907ea6d44
-SHA512 (rust-std-1.68.2-sparc64-unknown-netbsd.tar.xz) = 7c358c1fabc53f6a7ef9f0aeb0a73f776cd3884139a890d0b557d15740706136ff2f2dcd10320516045246218b669e04a94e4ae66ba9bfb6798ce509977e9324
-Size (rust-std-1.68.2-sparc64-unknown-netbsd.tar.xz) = 23480112 bytes
-BLAKE2s (rust-std-1.68.2-x86_64-apple-darwin.tar.gz) = 6951edb84f7baba0067f6a9b7c939da971fdce93b8d398de6b5bb772ad7deec3
-SHA512 (rust-std-1.68.2-x86_64-apple-darwin.tar.gz) = 88144ef598a3f3a9bb4302fd75d031819cda4f2321e4a3901dc80d9e68401d2295d17a5f236c9f1e603d11a06c6541707225c46646392b8c316cb77bd9d017fe
-Size (rust-std-1.68.2-x86_64-apple-darwin.tar.gz) = 46527398 bytes
-BLAKE2s (rust-std-1.68.2-x86_64-unknown-freebsd.tar.gz) = 7dd2a7b0692b0bdf7efabe3bda588e3ea58a3446b79d3e18d43a90bf45ea6b9d
-SHA512 (rust-std-1.68.2-x86_64-unknown-freebsd.tar.gz) = d45984725c86d6eafb4d7ab5a679a522c1574535ba305d2516cc9ff985a2e250e408c5f4ae92276e44ee68a9bec3aa8c27dda7573c9b865ad1a845b7f6e9b7b6
-Size (rust-std-1.68.2-x86_64-unknown-freebsd.tar.gz) = 47840355 bytes
-BLAKE2s (rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = 7c7b197d353dd1ffdf212f68e6010c8ea1cdb39dc6331cc24661b0da07ea58ae
-SHA512 (rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = d38894a239373b28fcf06a25b027c24dd8fee34d7162976775786fb9200548d3d508b9f31923f3c714aaf56a2903fd5c60f4540c9a498d2d10425de96cd4e735
-Size (rust-std-1.68.2-x86_64-unknown-linux-gnu.tar.gz) = 49477512 bytes
-BLAKE2s (rust-std-1.68.2-x86_64-unknown-netbsd.tar.xz) = ad2ad2b1c2fd5a7ac20eae8d3a067831b031efb39a57a0d1de3a3a82cfb35d82
-SHA512 (rust-std-1.68.2-x86_64-unknown-netbsd.tar.xz) = 3000ca0c1d5ba4a51fa6addfd351f662d5e40194e66529e8eea9b66835e9cdfe196b95e0f3662e4add4fba45bc511e76dd6e724fe4074dcab45584595a50b210
-Size (rust-std-1.68.2-x86_64-unknown-netbsd.tar.xz) = 29677456 bytes
-BLAKE2s (rustc-1.69.0-src.tar.gz) = 33933d1f333f8e4a09f07f648fc00d15707dc0e8c1e6a11243758d7ba8e90b18
-SHA512 (rustc-1.69.0-src.tar.gz) = 2f6ba43735225b171e14de4a00869411c77e4787b6f747604914b22d29dfef692107b90b360ed778b48b899a3afeac9f62081e53f04a8c0e1b7d2d0fcdf7d1f2
-Size (rustc-1.69.0-src.tar.gz) = 215711513 bytes
+BLAKE2s (rust-1.69.0-aarch64-apple-darwin.tar.gz) = 2c73f5c31f123054e7027f699e9a1bf8bdfbf9a3d7f108f66f70c13cf5ee0707
+SHA512 (rust-1.69.0-aarch64-apple-darwin.tar.gz) = 69b285e0097cefc8cf29cbb2621d7a85a019c09fbe1145ed913da4241ce2c468c7156f201d16e0d62629041f6b1fe5fb4ef7ef33944dfa0979834ae8e17e41b0
+Size (rust-1.69.0-aarch64-apple-darwin.tar.gz) = 233726423 bytes
+BLAKE2s (rust-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = fc3b5cdef3657d31dfd1c4fbfa713d5292c3b189d016f3aa5f2cf11734be1d85
+SHA512 (rust-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = eed54b2375c161d4dbf10146ed63c89fc219366e3b6d20928cb1d8690c51e70cfe278f9d85b8b4e72ecc741f0459d48223be56f5ce4e0fbbf89f129b5e576949
+Size (rust-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = 442597287 bytes
+BLAKE2s (rust-1.69.0-aarch64-unknown-netbsd.tar.xz) = 66def0c08c4bf37057380fff4240d8bb41649d2aef8590921f37b6f865576881
+SHA512 (rust-1.69.0-aarch64-unknown-netbsd.tar.xz) = d0ad3953ea950f618782ad6b6d8eaa188804a455607de434ddc313985d8f3247730afd5250103b492890c886dae924ebb6a42e5a1d37f69d6c989a54ae0435b8
+Size (rust-1.69.0-aarch64-unknown-netbsd.tar.xz) = 155086012 bytes
+BLAKE2s (rust-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = a8255ca372463cf76fdb0c5ab439cf4c60c067eb708b5d64d66469422a38aada
+SHA512 (rust-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = 2916f07c4694575ae9920f9be111967c52adebd45931b8a10516fe638692e2419aac1bcae012e728fb218100a0c167d809d2acffb0866bc6c79be8f224a08193
+Size (rust-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = 152716792 bytes
+BLAKE2s (rust-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = 159902525d504cae00f3bec5cb68a02867416ed3d7342480bbbe786f8d8e9096
+SHA512 (rust-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = feec870f88158e780c6722cdca1a3325559b032c76e9d63c1437ab01c151069eb511d25c0f104410e37fc52c41c576e9da1a5524aa4a1b88fddbb5e3c69c9cc3
+Size (rust-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = 335337307 bytes
+BLAKE2s (rust-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = b24318a32dea3dfd36a5f2ec4dbae099fb4242c13a0ef1795a859beb37b0fe54
+SHA512 (rust-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = 00d9f707bf5e8b207f9a81316a59ff6d458475d10cd251a5146aec43ab9df2d6ee74f37437919e6a32ceee0d48acad91edf314e7df38068ced79d29c29820a54
+Size (rust-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = 132417004 bytes
+BLAKE2s (rust-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = 951605cc4600beac6bc8e8978549e9ecc2c7760dbcda334cf1cbe3603be9ec3d
+SHA512 (rust-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = 5c0fc5420e9973b31f4364b9751f5a48358a1b644c220cae1aad722ef469b0770f84dfa65a2e1cc13c919e05da22cd140dc007c6ad1e98f6575699a2aa64dead
+Size (rust-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = 325597806 bytes
+BLAKE2s (rust-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = d365f793f6346db62230320fdb0f7c6693fa4c92cacaaa413060b6f98caf1cf9
+SHA512 (rust-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = b660d7ba05efd62385b669067d2ed289e33c7342dbdfa5035b4d6b4ddf9b9b620d1b15785d058933ea068e8a6adaf915c9405ce7c9b5343bb83ae7797187bb71
+Size (rust-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = 135210152 bytes
+BLAKE2s (rust-1.69.0-i586-unknown-netbsd.tar.xz) = 56c9440f7b789002820a7d0359bb6b3b1f645a114b688eba560317df5b27fd29
+SHA512 (rust-1.69.0-i586-unknown-netbsd.tar.xz) = a4fc4661e4d2c49bbad348e792a135d04ec2ad5975298aa30ad4e762cf165b23de520227d8c88d00d5588f58c0e27f931bdf1f099e8b2fcdb7f5e5045cd14aea
+Size (rust-1.69.0-i586-unknown-netbsd.tar.xz) = 167250680 bytes
+BLAKE2s (rust-1.69.0-i686-unknown-linux-gnu.tar.gz) = 1655a944775d7210aeeb54b3da17148f6e314b74f2d204d9c1e9a840149a5820
+SHA512 (rust-1.69.0-i686-unknown-linux-gnu.tar.gz) = 2b1d51883330abd4161ca1b8547a23f6be8af418ba8d361f87a565477b5ba9e2d43fc9ba2bf633aa90130f6d009c28b5d2ff8101d864292b2db9db75e5dec077
+Size (rust-1.69.0-i686-unknown-linux-gnu.tar.gz) = 392646441 bytes
+BLAKE2s (rust-1.69.0-mipsel-unknown-netbsd.tar.xz) = 59ed0abbe3c7a1abf0d61abc6634b75df79d62bb96b239a8445d3d07b02bea02
+SHA512 (rust-1.69.0-mipsel-unknown-netbsd.tar.xz) = 7e6b60498e251e75593794e7d82c3ce6a3fa40a3009a74ea4804c61a958b6ad26613a37104e85cd23e0adb633aec594d3463acad4b5d7edf2d22b27d4f7fd148
+Size (rust-1.69.0-mipsel-unknown-netbsd.tar.xz) = 133807068 bytes
+BLAKE2s (rust-1.69.0-powerpc-unknown-netbsd.tar.xz) = 72a822096bcbf47c4e6b88c8aa1b7843562ec67c84148cf7532191b24badd615
+SHA512 (rust-1.69.0-powerpc-unknown-netbsd.tar.xz) = aac375b17e74ea750f8360b2fda306bdc459f3fdd61de8166c4e0851cc593dcaec23906adba0eb46c3259f027b6953b6d4711ee8e60e592eaccea4cd607da4c7
+Size (rust-1.69.0-powerpc-unknown-netbsd.tar.xz) = 181252092 bytes
+BLAKE2s (rust-1.69.0-powerpc-unknown-netbsd90.tar.xz) = 9e2031e1506c98b07a1e37935eee07d94d151132555b8183e0771d628392f2ce
+SHA512 (rust-1.69.0-powerpc-unknown-netbsd90.tar.xz) = 7f5bb6270f7ea8cf8c85635ad45607cd344ed22689f3280d8e3b6915ccdd1895019dc3317e7c68678a78a5742ce6a3e1b8adf7ba486cf5d3cb6813a808cfe322
+Size (rust-1.69.0-powerpc-unknown-netbsd90.tar.xz) = 182053916 bytes
+BLAKE2s (rust-1.69.0-sparc64-unknown-netbsd.tar.xz) = e7111bcaed69fa59b8852f9363bf48e5c86630e3e7f747b5545d8bca6de6de9a
+SHA512 (rust-1.69.0-sparc64-unknown-netbsd.tar.xz) = b5a7e3d0855ef429aed1f5dd2678ae1c1283618a968ae94cb985fd7be0fe31128b5938f180f2f891709bcb27b9b89a37f6a4e3f870d73d48c8a31137cdb734ef
+Size (rust-1.69.0-sparc64-unknown-netbsd.tar.xz) = 149302728 bytes
+BLAKE2s (rust-1.69.0-x86_64-apple-darwin.tar.gz) = f14f265ed0ac3f30559b70c2ff9c4560dd92055d4a7681257dfa28332cb254e9
+SHA512 (rust-1.69.0-x86_64-apple-darwin.tar.gz) = 27ca5513804d641275a0b454fb256a2a631c0203c97d858c19379d352c6c7ab52d4a6df4fc0efd8dbfbc5d288389c3341136b3229904dd8a24865bc75b7feab2
+Size (rust-1.69.0-x86_64-apple-darwin.tar.gz) = 317276846 bytes
+BLAKE2s (rust-1.69.0-x86_64-unknown-freebsd.tar.gz) = dd3db3df05acab9d597424cc05dda4be4eccf76549b5c23647d1f002f3c8925e
+SHA512 (rust-1.69.0-x86_64-unknown-freebsd.tar.gz) = 6ffd908ee5397b7aa66fb51db4adf0330189b2fc40f4a73c773a195d03e45c92ee2c6591588e6b365ce09311a5f4ddf0aba939bf016ffd508afb6c2ce628788d
+Size (rust-1.69.0-x86_64-unknown-freebsd.tar.gz) = 301203472 bytes
+BLAKE2s (rust-1.69.0-x86_64-unknown-illumos.tar.gz) = e750d02582f4bca4eef0a7776e844263a9fc859858604d913cfc6d5abbfbcc9a
+SHA512 (rust-1.69.0-x86_64-unknown-illumos.tar.gz) = eb36e97d9fd8a1b3797f0702177f47666b98c852257094c779fad82426463ad5f8775a987e85ddff6abc8c3a22810dcb4267dedf77b3272bb05b8775ead18c51
+Size (rust-1.69.0-x86_64-unknown-illumos.tar.gz) = 214951989 bytes
+BLAKE2s (rust-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = 369c9093e1f733af47dd5be187e89a862f4779c441a5c135a5e0ecf7a11b1051
+SHA512 (rust-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = e0612cacb835a16a11ddb0778e7495ab14d43457b5320367d01e38e194c4c47336599cc52fa910301a77116c5cabbf6634dcb2ede106bb4a1658c1c1c54d7393
+Size (rust-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = 313223558 bytes
+BLAKE2s (rust-1.69.0-x86_64-unknown-netbsd.tar.xz) = 0f496263dec8d276eb94408f4acae659ec850b10b7920c935d1d470922d1fb78
+SHA512 (rust-1.69.0-x86_64-unknown-netbsd.tar.xz) = ea442d784c3b5b09ad1113fd8baf6a725bf4c0c78134fefb1b5ae9773bba23d7c16c7ec8af074817115e3b4113e21581c0ac3ba539de7bfc83d0584c2c2a1b94
+Size (rust-1.69.0-x86_64-unknown-netbsd.tar.xz) = 147881648 bytes
+BLAKE2s (rust-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = 2d0c4186ec4aad6abc5a1b95dca0009a43ce3963f1302610759db16965a7e067
+SHA512 (rust-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = 9a7cbe5cd5bcb29b01a244f01eb061f48d4d8a5881f47bf1e772c9c0219d34a11edb875635b04047763d8e1efbce75be2f60f0ff76cfb1fa04db3af8a36076f1
+Size (rust-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = 205554164 bytes
+BLAKE2s (rust-std-1.69.0-aarch64-apple-darwin.tar.gz) = f36fd4398d053b14648269256a72400943d73053ceb40568bc466cf0e5e79836
+SHA512 (rust-std-1.69.0-aarch64-apple-darwin.tar.gz) = 52ba516f4138e24d4a91c86220a5c0b8552426e244fac1cff2ae7149fa68d5dcff7767700f31e612fd4c51acb59375a63ca57e6ebf609cec9ef55d7f409247b8
+Size (rust-std-1.69.0-aarch64-apple-darwin.tar.gz) = 42521697 bytes
+BLAKE2s (rust-std-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = 39793445b796aa9584ac33cf7ce90c254b3043a31a35b43630f7e5a6bbca3a25
+SHA512 (rust-std-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = c809bfe84879df6400fbfb45b7ba82d2933c2f3e7a704b18a55a650c778cd10e22d7d72fa17f5a8d19925fb40e0ca873e4259202d365e9a64e0a5a5489311f12
+Size (rust-std-1.69.0-aarch64-unknown-linux-gnu.tar.gz) = 65261742 bytes
+BLAKE2s (rust-std-1.69.0-aarch64-unknown-netbsd.tar.xz) = 6e1bb9a57640a468aca8d4542b360bb4d7f096cb6e108ed8ca31642cd91cd867
+SHA512 (rust-std-1.69.0-aarch64-unknown-netbsd.tar.xz) = 969b0c9c26e9922f35971c07bcc5ba1de398c4a16427d07b5704190fcbc7aca9c577560c805190beb8166d604b8fbff728631f0e65dbd01a801a72332c97d49f
+Size (rust-std-1.69.0-aarch64-unknown-netbsd.tar.xz) = 24915664 bytes
+BLAKE2s (rust-std-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = 935e4a7887b0fceb658820ec56c04006b91beea20411fbea5d91b4a841f0d90e
+SHA512 (rust-std-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = faf6ee7b9f9d1625e62c0cde98ed9a71798398e3b5cc7e41d6e7c6733c07ea91a0636923014e1b26788e6574a11bb6dea336f45df5285ff9d7d34747a9440fa2
+Size (rust-std-1.69.0-aarch64_be-unknown-netbsd.tar.xz) = 24787988 bytes
+BLAKE2s (rust-std-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = 766eea2f01db9c11362bff25691b1055e24ff9416d0275e6fbd5df9f46339029
+SHA512 (rust-std-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = 74b9bcb6d01f99bc5e45878e4b48fa16f0b0503bb59917c677debce527783f10add79b961e0d8bf642724a0b944b1d63302903bd5f2fb412f47cd2f5792d4b6a
+Size (rust-std-1.69.0-arm-unknown-linux-gnueabihf.tar.gz) = 38943160 bytes
+BLAKE2s (rust-std-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = b9df63c4e1bb0f18fa0cf2dde1554ef677e1ea3da23330217718f4bc4afc3c2d
+SHA512 (rust-std-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = 80e562847802f96723b14a5b9228c79c6b71873e7ca419c29edabe6f993d36505e934094e86787015ff93b45ec8dd261fa7fa7dd212520ffc4e92410051914ac
+Size (rust-std-1.69.0-armv6-unknown-netbsd-eabihf.tar.xz) = 23298608 bytes
+BLAKE2s (rust-std-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = b1a4ad611d4272997a5a9df02e53d3c8b874c28e72a3a4b34a37e87dd4a9d00f
+SHA512 (rust-std-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = 74a684afbbebfeb7b1e5d3d6454935827e659579959cba6385e843b546c2086b6d1cc380c9fa785b3590d35a2726e76e23ba2ad90c63f34ffbb259b7137edcd8
+Size (rust-std-1.69.0-armv7-unknown-linux-gnueabihf.tar.gz) = 40541598 bytes
+BLAKE2s (rust-std-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = 16b48b47ff3f597d55b240b0264e7c0623f43a81f82b762c3b3030547c2b67d3
+SHA512 (rust-std-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = cf45a4635b873b31c11c70b6c1baa00c37eac73902b5109e4270c50ab13fe37b609fda78c0005b5110ca5db182f5a6ad54762a491521e90cbc152a9f98ded5f9
+Size (rust-std-1.69.0-armv7-unknown-netbsd-eabihf.tar.xz) = 24112084 bytes
+BLAKE2s (rust-std-1.69.0-i586-unknown-netbsd.tar.xz) = b1d6a274504e0998162bd9d7a24d1ae53ac48e27ad078e20b337da5d9ee9d11f
+SHA512 (rust-std-1.69.0-i586-unknown-netbsd.tar.xz) = efb8d5eb70aa3ce804d2b83536e409cb70cd843288dda79132c80a90a889a7eb37c5929471c7490659355738fcfe62e2ab2a49ffe63234b27908f13d8d613a98
+Size (rust-std-1.69.0-i586-unknown-netbsd.tar.xz) = 25340244 bytes
+BLAKE2s (rust-std-1.69.0-i686-unknown-linux-gnu.tar.gz) = 4c2e1a9e9b4f900b27936019c9854524f04181be9981695154d7cf1853d3bc9e
+SHA512 (rust-std-1.69.0-i686-unknown-linux-gnu.tar.gz) = 1a885aaf1e27db157de00f09c37fc3a8441ac43549e7de939e5895f30bdc025472ddc1580040c3a0cc8a5deedb2fa7f3abb48b4cff8837cd143796df74c92e3d
+Size (rust-std-1.69.0-i686-unknown-linux-gnu.tar.gz) = 43030590 bytes
+BLAKE2s (rust-std-1.69.0-mipsel-unknown-netbsd.tar.xz) = 32894c284b7dfab0491b5ddf0f8e5ce5f36d782168e58cbf01bc25db403a269d
+SHA512 (rust-std-1.69.0-mipsel-unknown-netbsd.tar.xz) = cf9d4d9a238a421fcc4272c07f7a513fb7886b59932f228cbad9b873aeb100f62c2b9a7dd0b2b5b845b319bc195bef4bd491418476502f18d450929cbdca2ef5
+Size (rust-std-1.69.0-mipsel-unknown-netbsd.tar.xz) = 23117500 bytes
+BLAKE2s (rust-std-1.69.0-powerpc-unknown-netbsd.tar.xz) = 13c17f5fb6918e81ee70e494771afd3c76594eb8e3c14e0eb6e972a3d9f27d9f
+SHA512 (rust-std-1.69.0-powerpc-unknown-netbsd.tar.xz) = d154168f34eda456066e31c928bab320e91a0879b358b5f98233df1c3d702a03424b8e4ddf56d7d66ec5d98d79a85934ed5db2a4efd13dd734c99a3628b550bc
+Size (rust-std-1.69.0-powerpc-unknown-netbsd.tar.xz) = 23102960 bytes
+BLAKE2s (rust-std-1.69.0-powerpc-unknown-netbsd90.tar.xz) = ba391f89deaa3ea7f8429e48c4a2a182df2964864a7a061136131b70a971d1a6
+SHA512 (rust-std-1.69.0-powerpc-unknown-netbsd90.tar.xz) = 2a7f64663350adf0c91fb41aff8003bd8141b3bd3200e5b518cb2351d07d90d926bc74cd033859a17a671f812b3204fa51bb923e33fece4f400f49140e6cc1ab
+Size (rust-std-1.69.0-powerpc-unknown-netbsd90.tar.xz) = 23089464 bytes
+BLAKE2s (rust-std-1.69.0-sparc64-unknown-netbsd.tar.xz) = 59aad4d6704195526cde21b43420daccd380ecf20ce6c5239c0f85f31e67cab6
+SHA512 (rust-std-1.69.0-sparc64-unknown-netbsd.tar.xz) = d5f781f25f7f0d69bd7fe185dde4ccb26c544e9d3482e05bf12cf59be984c75f65251029c78de6505e523867c1b4bddf89bc34bc1512b7fc18aba76d3b7ef46f
+Size (rust-std-1.69.0-sparc64-unknown-netbsd.tar.xz) = 23075120 bytes
+BLAKE2s (rust-std-1.69.0-x86_64-apple-darwin.tar.gz) = 101c43595bd768ad7e952545c6a5a113e6800a06a3689da22ba6d5a29d6332c3
+SHA512 (rust-std-1.69.0-x86_64-apple-darwin.tar.gz) = beeedd2f25e1331fae387bc7663c2ca8df55dee2c30bfbb00d825fdce9b492d47dd5bc01ee4930152d6f84ccbf1b92ae290cd30be766b178ff469bee51e81513
+Size (rust-std-1.69.0-x86_64-apple-darwin.tar.gz) = 44783473 bytes
+BLAKE2s (rust-std-1.69.0-x86_64-unknown-freebsd.tar.gz) = b7a6780b7d72581ba9d454aa19733bb793044598c276cecc5becd79ec01401b8
+SHA512 (rust-std-1.69.0-x86_64-unknown-freebsd.tar.gz) = 6784e33493904deffeedd3957f9df7aa57ffa43acc9a7bf950e8fe92d6400d76848131ad3e5f2a94bc111f11999b12f1b2f12f37e636167d257ed81fc4f64adb
+Size (rust-std-1.69.0-x86_64-unknown-freebsd.tar.gz) = 46086310 bytes
+BLAKE2s (rust-std-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = 5162d5038c58e2f3f407b451e0611825da36924ad50965bfe0b34c5769ff7f32
+SHA512 (rust-std-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = dd15925ab5acf1e0368379f933c56c5a22cb9fa65c903509ec29569034090b93cc1ac2fc7daf5739aee66857b8a9cb5b76b1bdcd421b60f9d3148eceef6844ab
+Size (rust-std-1.69.0-x86_64-unknown-linux-gnu.tar.gz) = 47727711 bytes
+BLAKE2s (rust-std-1.69.0-x86_64-unknown-netbsd.tar.xz) = 8ad9cf08acc2b777bbefb91bb325da32ea9aed54b0ffffa116e4f7c3d69550c0
+SHA512 (rust-std-1.69.0-x86_64-unknown-netbsd.tar.xz) = 14f82fb73a8cef5caf2b636b36a3f6be45b6f0151170186c07fde3ef033c2ae6750b370841a21ce26d78ebc945f52844bd54b918ad4b92e110fb080d129367b6
+Size (rust-std-1.69.0-x86_64-unknown-netbsd.tar.xz) = 27369152 bytes
+BLAKE2s (rust-std-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = e08222494230c9a35d15c5352d740d97707ebad20686ee663689a7139fc201a3
+SHA512 (rust-std-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = ef61701dc6fda74148e7654645986fedafb4cbc4358d7571d4d1f66123d98d6026f9fbe557726c926a0029731519b6d70794d61c5baf6604ba8043030e567882
+Size (rust-std-1.70.0-riscv64gc-unknown-netbsd.tar.xz) = 25794632 bytes
+BLAKE2s (rustc-1.70.0-src.tar.gz) = 9048807c1db0b7bbd0ea77c9e6552b896337e7e917c619f2767c53c416b6ab2a
+SHA512 (rustc-1.70.0-src.tar.gz) = 4c88bccdd09583f3e347770d846260a054fdbfe10b4ea9b68576794ffe104ab73a054b514262010269d7ed82b088131621461559b24a079fd35243a80d219395
+Size (rustc-1.70.0-src.tar.gz) = 251552252 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 62819cf6db7d2e3e77d433fe883046c28fc20d91
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 190ff5e38c3a48bb4f11f4f8e5636bdeb36a0230
 SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
 SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 866d01e7c1f3d8dd7d26f2fdc4360df273ed401f
 SHA1 (patch-compiler_rustc__target_src_spec_mips64el__unknown__netbsd.rs) = a0fb5338d0020d3ee1266d1ed1361e7bf2eea611
 SHA1 (patch-compiler_rustc__target_src_spec_mipsel__unknown__netbsd.rs) = fc78fc681f170be9e3b6e3c823a6bd62da742cbd
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 5042a89fe5da4219b54082c104a1b44ba7cc395e
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = effb8250d07dc9ed1d5735060c528a46c422c10e
 SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = bc73a140d7b1d3ced12ad2564be4edce5b9579f0
+SHA1 (patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs) = 56abcfc73bc61960f7c680c856f54b50ec053f30
 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 32ab8ea3809cd4f6fee9fc0df5db47d76ccbd9d2
 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be
+SHA1 (patch-library_core_src_ffi_mod.rs) = 7678d57edc05a66abca73d4676cbb7bd588741bc
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = 36a3085500ecbb34f8ecc08388c164da54bdf5d4
 SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766d34bd2b8c348ce29c6ae2ba163
 SHA1 (patch-src_bootstrap_bootstrap.py) = 4ed2fd1a43c1e0bae842c3c82012143c28346ce4
 SHA1 (patch-src_bootstrap_builder.rs) = 98daac929d2bbc9c475c39d225d50d37491528a8
 SHA1 (patch-src_bootstrap_compile.rs) = 71b58c0e14b820dafc48ce087292267e7d2eed0f
-SHA1 (patch-src_bootstrap_install.rs) = 5b10a2706d67096791f25c723721cb4824fd584f
 SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
+SHA1 (patch-src_bootstrap_llvm.rs) = 49cbd9c695bd1f6c635300490e69baefcc80323c
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
@@ -143,23 +151,28 @@ SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e7
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
-SHA1 (patch-vendor_cc_src_lib.rs) = dc40f4fb0f7508b886d6d93b27e9936403a96765
+SHA1 (patch-vendor_cc-1.0.73_src_lib.rs) = 98acea9fb98898f63bbb0f6555df5e4b15da2b85
+SHA1 (patch-vendor_cc-1.0.77_src_lib.rs) = 19d5608a2afa6d325bc1f47a48551797a1be8453
+SHA1 (patch-vendor_cc_src_lib.rs) = b03998072fda91995e9aa5e81bb590da99a4c004
 SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = 0b38d2314d9187ab745f2aa426015794c18f206c
 SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = 074bd55721719275275b35d941bc138670e4d63c
-SHA1 (patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 050dcd4dccb507d59f71ad30d87d01b1e9a0c696
-SHA1 (patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs) = f09ed8346e2a449424d12dcd98361da4625caece
 SHA1 (patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mips.rs) = eda31064a08cba20fc0652b669e419871875ae29
-SHA1 (patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs) = ce0906db31e9f4664b2683cf93f3940d97a311cd
+SHA1 (patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e9c180ddbbd06ba2e0701bec11f1e6c954c0a0d4
+SHA1 (patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 24ebcb044aeefec3415323b77ac25805a98b296e
+SHA1 (patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs) = aa7d06c87a6826e7187c57a72bf27ecc55ab3e8e
+SHA1 (patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c134584dadea923a33140474a30b0c55207d59d1
+SHA1 (patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 77b58e2e1e136ad9913d2304bc64b9958e852227
 SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 09326b70d7821b1742285c464c70b347400191d7
-SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 5b74832fac31de5064eee07e240be4acdbb8606c
+SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 50df059ffa3426a73e6978fe22c6e053eed8dce4
+SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 29e7a98dff00e092b89428a8ed464da503cba60d
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
 SHA1 (patch-vendor_nix_src_sys_signal.rs) = bf4fcdc5b71d8d73b3d7e8acfccd0554d822c131
 SHA1 (patch-vendor_openssl-src_openssl_Configurations_10-main.conf) = 1c4e1d5520776e70d588f3da0fd54b6f956835b5
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = 918fac850f3a6e948d25ef3f673ef62345de386f
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = 9511c09ed2bf035d3c1e684492bbb8f46d4e58ef
 SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 8c4311cdd2bd66882fa8406e28119a0144df5301
-SHA1 (patch-vendor_openssl-sys_build_main.rs) = 3924efda02e7d8e2115db55b84a7dcc9756e365c
+SHA1 (patch-vendor_openssl-sys_build_main.rs) = 20618b13b56cc93bb5c051f96046604dd4977345
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
-SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 7aab839a16e51534aee01a8d3098d7a916803ec4
+SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 8562658e5f11ab1cf977d83fc48c4b3c000fbc0e
 SHA1 (patch-vendor_valuable_no__atomic.rs) = 3a40cb846bf1fae864c55a0ddba8fdeb5efcba72
diff --git a/lang/rust/do-cross.mk b/lang/rust/do-cross.mk
index 55b6b7682a05..311ba6747f92 100644
--- a/lang/rust/do-cross.mk
+++ b/lang/rust/do-cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: do-cross.mk,v 1.6 2023/01/23 18:49:03 he Exp $
+# $NetBSD: do-cross.mk,v 1.7 2023/07/10 12:01:24 he Exp $
 # Do all the NetBSD cross builds
 # Collect the bootstrap kits in dist/
 
@@ -9,11 +9,11 @@ SHORT_TARGETS+=		armv7
 SHORT_TARGETS+=		armv6
 SHORT_TARGETS+=		sparc64
 SHORT_TARGETS+=		powerpc
-SHORT_TARGETS+=		powerpc90
 SHORT_TARGETS+=		arm64
 SHORT_TARGETS+=		arm64_be
 SHORT_TARGETS+=		i386
 SHORT_TARGETS+=		mipsel	# produces mips32 (not mips1) executables
+SHORT_TARGETS+=		riscv64
 
 # Conditional local overrides of ROOT.* variables:
 .sinclude "local-roots.mk"
@@ -24,36 +24,36 @@ ROOT.armv7?=		/u/evbarm-armv7hf
 ROOT.armv6?=		/u/evbarm-armv6hf
 ROOT.sparc64?=		/u/sparc64
 ROOT.powerpc?=		/u/macppc
-ROOT.powerpc90?=	/u/9.0-macppc
 ROOT.arm64?=		/u/evbarm64
 ROOT.arm64_be?=		/u/evbarm64eb
 ROOT.i386?=		/u/i386
 ROOT.mipsel?=		/u/mipsel
+ROOT.riscv64?=		/u/riscv64
 
 # Mapping to GNU triple
 G_TGT.armv7=		armv7--netbsdelf-eabihf
 G_TGT.armv6=		armv6--netbsdelf-eabihf
 G_TGT.sparc64=		sparc64--netbsd
 G_TGT.powerpc=		powerpc--netbsd
-G_TGT.powerpc90=	powerpc--netbsd
 G_TGT.arm64=		aarch64--netbsd
 G_TGT.arm64_be=		aarch64_be--netbsd
 G_TGT.i386=		i486--netbsdelf
 G_TGT.mipsel=		mipsel--netbsd
+G_TGT.riscv64=		riscv64--netbsd
 
 # Mapping to rust's TARGET specification
 TGT.armv7=		armv7-unknown-netbsd-eabihf
 TGT.armv6=		armv6-unknown-netbsd-eabihf
 TGT.sparc64=		sparc64-unknown-netbsd
 TGT.powerpc=		powerpc-unknown-netbsd
-TGT.powerpc90=		powerpc-unknown-netbsd
 TGT.arm64=		aarch64-unknown-netbsd
 TGT.arm64_be=		aarch64_be-unknown-netbsd
 TGT.i386=		i586-unknown-netbsd
 TGT.mipsel=		mipsel-unknown-netbsd
+TGT.riscv64=		riscv64gc-unknown-netbsd
 
 # Optional target tweak for bootstrap files
-TT.powerpc90=		powerpc-unknown-netbsd90
+TT.powerpc=		powerpc-unknown-netbsd90
 
 WRKDIR=		${.CURDIR}/work
 SCRIPTS=	${WRKDIR}/scripts
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
index 55db306d0d5e..6a62968458ad 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.12 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.13 2023/07/10 12:01:24 he Exp $
 
-Add i586(pentium), aarch64_be and mips NetBSD targets.
+Add i586(pentium), aarch64_be, mipsel and riscv64gc NetBSD targets.
 
 --- compiler/rustc_target/src/spec/mod.rs.orig	2021-03-23 16:15:10.000000000 +0000
 +++ compiler/rustc_target/src/spec/mod.rs
-@@ -989,9 +989,12 @@ supported_targets! {
+@@ -1100,10 +1100,14 @@ supported_targets! {
      ("x86_64-unknown-openbsd", x86_64_unknown_openbsd),
  
      ("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
@@ -15,5 +15,7 @@ Add i586(pentium), aarch64_be and mips NetBSD targets.
 +    ("i586-unknown-netbsd", i586_unknown_netbsd),
 +    ("mipsel-unknown-netbsd", mipsel_unknown_netbsd),
      ("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
++    ("riscv64gc-unknown-netbsd", riscv64gc_unknown_netbsd),
      ("sparc64-unknown-netbsd", sparc64_unknown_netbsd),
      ("x86_64-unknown-netbsd", x86_64_unknown_netbsd),
+ 
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs
new file mode 100644
index 000000000000..acd6a6db71ee
--- /dev/null
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs
@@ -0,0 +1,26 @@
+$NetBSD: patch-compiler_rustc__target_src_spec_riscv64gc__unknown__netbsd.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Target spec for NetBSD/riscv64.
+
+--- compiler/rustc_target/src/spec/riscv64gc_unknown_netbsd.rs.orig	2023-07-02 04:17:02.369254026 +0000
++++ compiler/rustc_target/src/spec/riscv64gc_unknown_netbsd.rs	2023-07-02 18:24:04.339160957 +0000
+@@ -0,0 +1,19 @@
++use crate::spec::{CodeModel, Target, TargetOptions};
++
++pub fn target() -> Target {
++    Target {
++        llvm_target: "riscv64-unknown-netbsd".into(),
++        pointer_width: 64,
++        data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
++        arch: "riscv64".into(),
++        options: TargetOptions {
++            code_model: Some(CodeModel::Medium),
++            cpu: "generic-rv64".into(),
++            features: "+m,+a,+f,+d,+c".into(),
++            llvm_abiname: "lp64d".into(),
++            max_atomic_width: Some(64),
++            mcount: "__mcount".into(),
++            ..super::netbsd_base::opts()
++        },
++    }
++}
diff --git a/lang/rust/patches/patch-library_core_src_ffi_mod.rs b/lang/rust/patches/patch-library_core_src_ffi_mod.rs
new file mode 100644
index 000000000000..e2bce8df11ad
--- /dev/null
+++ b/lang/rust/patches/patch-library_core_src_ffi_mod.rs
@@ -0,0 +1,20 @@
+$NetBSD: patch-library_core_src_ffi_mod.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+NetBSD/riscv64 also has unsigned chars.
+
+--- library/core/src/ffi/mod.rs.orig	2023-05-31 19:28:10.000000000 +0000
++++ library/core/src/ffi/mod.rs
+@@ -132,7 +132,12 @@ mod c_char_definition {
+             ),
+             all(
+                 target_os = "netbsd",
+-                any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc")
++                any(
++		    target_arch = "aarch64",
++                    target_arch = "arm",
++                    target_arch = "powerpc",
++                    target_arch = "riscv64"
++                )
+             ),
+             all(
+                 target_os = "vxworks",
diff --git a/lang/rust/patches/patch-src_bootstrap_install.rs b/lang/rust/patches/patch-src_bootstrap_install.rs
deleted file mode 100644
index 88f6a6d6990e..000000000000
--- a/lang/rust/patches/patch-src_bootstrap_install.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_bootstrap_install.rs,v 1.2 2023/04/08 18:18:11 he Exp $
-
-Apply fix from https://github.com/rust-lang/rust/pull/109256.
-
---- src/bootstrap/install.rs.orig	2023-03-21 21:31:48.458992230 +0000
-+++ src/bootstrap/install.rs
-@@ -210,10 +210,13 @@ install!((self, builder, _config),
-         }
-     };
-     LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
--        let tarball = builder
--            .ensure(dist::LlvmTools { target: self.target })
--            .expect("missing llvm-tools");
--        install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
-+        if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) {
-+            install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
-+        } else {
-+            builder.info(
-+                &format!("skipping llvm-tools stage{} ({}): external LLVM", self.compiler.stage, self.target),
-+            );
-+        }
-     };
-     Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
-         if let Some(tarball) = builder.ensure(dist::Rustfmt {
diff --git a/lang/rust/patches/patch-src_bootstrap_llvm.rs b/lang/rust/patches/patch-src_bootstrap_llvm.rs
new file mode 100644
index 000000000000..cc95c433879f
--- /dev/null
+++ b/lang/rust/patches/patch-src_bootstrap_llvm.rs
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bootstrap_llvm.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Add NetBSD to the list of riscv's which don't need -latomic.
+
+--- src/bootstrap/llvm.rs.orig	2023-05-31 19:28:10.000000000 +0000
++++ src/bootstrap/llvm.rs
+@@ -379,7 +379,7 @@ impl Step for Llvm {
+             cfg.define("LLVM_LINK_LLVM_DYLIB", "ON");
+         }
+ 
+-        if target.starts_with("riscv") && !target.contains("freebsd") && !target.contains("openbsd")
++        if target.starts_with("riscv") && !target.contains("freebsd") && !target.contains("openbsd") && !target.contains("netbsd")
+         {
+             // RISC-V GCC erroneously requires linking against
+             // `libatomic` when using 1-byte and 2-byte C++
diff --git a/lang/rust/patches/patch-vendor_cc-1.0.73_src_lib.rs b/lang/rust/patches/patch-vendor_cc-1.0.73_src_lib.rs
new file mode 100644
index 000000000000..78484171ac03
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_cc-1.0.73_src_lib.rs
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_cc-1.0.73_src_lib.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Use correct ABI on NetBSD/riscv64.
+
+--- vendor/cc-1.0.73/src/lib.rs.orig	2023-05-31 21:44:47.000000000 +0000
++++ vendor/cc-1.0.73/src/lib.rs
+@@ -1830,6 +1830,9 @@ impl Build {
+                         } else if target.contains("freebsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
++                        } else if target.contains("netbsd") && arch.starts_with("64") {
++                            cmd.args.push(("-march=rv64gc").into());
++                            cmd.args.push("-mabi=lp64d".into());
+                         } else if target.contains("openbsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
diff --git a/lang/rust/patches/patch-vendor_cc-1.0.77_src_lib.rs b/lang/rust/patches/patch-vendor_cc-1.0.77_src_lib.rs
new file mode 100644
index 000000000000..65e77a0f8404
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_cc-1.0.77_src_lib.rs
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_cc-1.0.77_src_lib.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Use correct ABI on NetBSD/riscv64.
+
+--- vendor/cc-1.0.77/src/lib.rs.orig	2023-05-31 21:44:47.000000000 +0000
++++ vendor/cc-1.0.77/src/lib.rs
+@@ -1913,6 +1913,9 @@ impl Build {
+                         } else if target.contains("freebsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
++                        } else if target.contains("netbsd") && arch.starts_with("64") {
++                            cmd.args.push(("-march=rv64gc").into());
++                            cmd.args.push("-mabi=lp64d".into());
+                         } else if target.contains("openbsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
diff --git a/lang/rust/patches/patch-vendor_cc_src_lib.rs b/lang/rust/patches/patch-vendor_cc_src_lib.rs
index e3b87ce68472..1f8459d44f3b 100644
--- a/lang/rust/patches/patch-vendor_cc_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_cc_src_lib.rs
@@ -1,10 +1,20 @@
-$NetBSD: patch-vendor_cc_src_lib.rs,v 1.9 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-vendor_cc_src_lib.rs,v 1.10 2023/07/10 12:01:24 he Exp $
 
-Add aarch64_eb and mipsel for NetBSD.
+Add aarch64_eb, mipsel and riscv64 for NetBSD.
 
 --- vendor/cc/src/lib.rs.orig	2021-07-26 15:20:38.000000000 +0000
 +++ vendor/cc/src/lib.rs
-@@ -2551,6 +2551,7 @@ impl Build {
+@@ -1933,6 +1933,9 @@ impl Build {
+                         } else if target.contains("freebsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
++                        } else if target.contains("netbsd") && arch.starts_with("64") {
++                            cmd.args.push(("-march=rv64gc").into());
++                            cmd.args.push("-mabi=lp64d".into());
+                         } else if target.contains("openbsd") && arch.starts_with("64") {
+                             cmd.args.push(("-march=rv64gc").into());
+                             cmd.args.push("-mabi=lp64d".into());
+@@ -2744,6 +2747,7 @@ impl Build {
              "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
              "aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
              "aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
@@ -12,7 +22,7 @@ Add aarch64_eb and mipsel for NetBSD.
              "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
              "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
              "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
-@@ -2585,6 +2586,7 @@ impl Build {
+@@ -2778,6 +2782,7 @@ impl Build {
              "mips-unknown-linux-musl" => Some("mips-linux-musl"),
              "mipsel-unknown-linux-gnu" => Some("mipsel-linux-gnu"),
              "mipsel-unknown-linux-musl" => Some("mipsel-linux-musl"),
@@ -20,3 +30,11 @@ Add aarch64_eb and mipsel for NetBSD.
              "mips64-unknown-linux-gnuabi64" => Some("mips64-linux-gnuabi64"),
              "mips64el-unknown-linux-gnuabi64" => Some("mips64el-linux-gnuabi64"),
              "mipsisa32r6-unknown-linux-gnu" => Some("mipsisa32r6-linux-gnu"),
+@@ -2819,6 +2824,7 @@ impl Build {
+                 "riscv32-unknown-elf",
+                 "riscv-none-embed",
+             ]),
++            "riscv64gc-unknown-netbsd" => Some("riscv64--netbsd"),
+             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
+             "riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"),
+             "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 92024c2738ce..6d0b81ae4fcf 100644
--- a/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,6 +1,7 @@
-$NetBSD: patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/05/03 22:39:09 he Exp $
+$NetBSD: patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.2 2023/07/10 12:01:24 he Exp $
 
-Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips.
+Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips
+and NetBSD/riscv64.
 
 --- vendor/libc-0.2.138/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2023-04-16 23:32:41.000000000 +0000
 +++ vendor/libc-0.2.138/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -27,13 +28,16 @@ Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips.
  cfg_if! {
      if #[cfg(target_arch = "aarch64")] {
          mod aarch64;
-@@ -3068,7 +3084,12 @@ cfg_if! {
+@@ -3068,7 +3084,15 @@ cfg_if! {
      } else if #[cfg(target_arch = "x86")] {
          mod x86;
          pub use self::x86::*;
 +    } else if #[cfg(target_arch = "mips")] {
 +	mod mips;
-+	pub use self:;mips::*;
++	pub use self::mips::*;
++    } else if #[cfg(target_arch = "riscv64")] {
++        mod riscv64;
++        pub use self::riscv64:*;
      } else {
 -        // Unknown target_arch
 +        // Unknown target_arch, this should error out
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 000000000000..07333344d7bc
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,31 @@
+$NetBSD: patch-vendor_libc-0.2.138_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Spec for riscv64.
+
+--- vendor/libc-0.2.138/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig	2023-07-02 18:40:59.815126792 +0000
++++ vendor/libc-0.2.138/src/unix/bsd/netbsdlike/netbsd/riscv64.rs	2023-07-02 18:38:40.729445691 +0000
+@@ -0,0 +1,24 @@
++use PT_FIRSTMACH;
++
++pub type c_long = i64;
++pub type c_ulong = u64;
++pub type c_char = u8;
++pub type __cpu_simple_lock_nv_t = ::c_int;
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 8 - 1;
++    }
++}
++
++// pub const _MAX_PAGE_SHIFT: u32 = 12;
++
++pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
++pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
++pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
++pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs
similarity index 76%
rename from lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs
rename to lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs
index 86c83941c376..d99a2607d8bc 100644
--- a/lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs
+++ b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs
@@ -1,9 +1,9 @@
-$NetBSD: patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mips.rs,v 1.1 2023/05/03 22:39:09 he Exp $
+$NetBSD: patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mips.rs,v 1.1 2023/07/10 12:01:24 he Exp $
 
 Add file for NetBSD/mips in mips32 variant.
 
---- vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig	2023-04-23 16:08:32.294600810 +0000
-+++ vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mips.rs
+--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig	2023-04-23 16:08:32.294600810 +0000
++++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mips.rs
 @@ -0,0 +1,22 @@
 +use PT_FIRSTMACH;
 +
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs
similarity index 72%
rename from lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
rename to lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 504cf431e665..803b0cbe1753 100644
--- a/lang/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,10 +1,11 @@
-$NetBSD: patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.2 2023/05/03 22:39:09 he Exp $
+$NetBSD: patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/07/10 12:01:24 he Exp $
 
-Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips.
+Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips
+and NetBSD/riscv64.
 
---- vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2023-04-16 23:32:41.000000000 +0000
-+++ vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -3025,6 +3025,23 @@ extern "C" {
+--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2023-04-16 23:32:41.000000000 +0000
++++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3049,6 +3049,23 @@ extern "C" {
      pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
  }
  
@@ -28,13 +29,16 @@ Add execinfo / backtrace stuff for NetBSD, and handle NetBSD/mips.
  cfg_if! {
      if #[cfg(target_arch = "aarch64")] {
          mod aarch64;
-@@ -3044,7 +3061,12 @@ cfg_if! {
+@@ -3068,7 +3085,15 @@ cfg_if! {
      } else if #[cfg(target_arch = "x86")] {
          mod x86;
          pub use self::x86::*;
 +    } else if #[cfg(target_arch = "mips")] {
 +        mod mips;
 +        pub use self::mips::*;
++    } else if #[cfg(target_arch = "riscv64")] {
++        mod riscv64;
++        pub use self::riscv64::*;
      } else {
 -        // Unknown target_arch
 +        // Unknown target_arch, this should error out
diff --git a/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 000000000000..968de9f58863
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,31 @@
+$NetBSD: patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Spec for riscv64.
+
+--- vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig	2023-07-02 18:40:59.815126792 +0000
++++ vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs	2023-07-02 18:38:40.729445691 +0000
+@@ -0,0 +1,24 @@
++use PT_FIRSTMACH;
++
++pub type c_long = i64;
++pub type c_ulong = u64;
++pub type c_char = u8;
++pub type __cpu_simple_lock_nv_t = ::c_int;
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 8 - 1;
++    }
++}
++
++// pub const _MAX_PAGE_SHIFT: u32 = 12;
++
++pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
++pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
++pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
++pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;
diff --git a/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 8cbd81978cb6..f0e1f1311083 100644
--- a/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,10 +1,11 @@
-$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.5 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.6 2023/07/10 12:01:24 he Exp $
 
 Copy execinfo function definitions from openbsd's mod.rs.
+Add entries for NetBSD/mipsel and NetBSD/riscv64.
 
 --- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-05-10 20:59:35.217463943 +0000
 +++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -3008,6 +3008,22 @@ extern "C" {
+@@ -3111,6 +3111,22 @@ extern "C" {
      pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
  }
  
@@ -27,13 +28,16 @@ Copy execinfo function definitions from openbsd's mod.rs.
  cfg_if! {
      if #[cfg(target_arch = "aarch64")] {
          mod aarch64;
-@@ -3027,7 +3043,12 @@ cfg_if! {
+@@ -3130,7 +3146,15 @@ cfg_if! {
      } else if #[cfg(target_arch = "x86")] {
          mod x86;
          pub use self::x86::*;
 +    } else if #[cfg(target_arch = "mips")] {
 +        mod mips;
 +        pub use self::mips::*;
++    } else if #[cfg(target_arch = "riscv64")] {
++        mod riscv64;
++        pub use self::riscv64::*;
      } else {
 -        // Unknown target_arch
 +        // Unknown target_arch, this should error out
diff --git a/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 000000000000..6d09f190cc07
--- /dev/null
+++ b/lang/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,31 @@
+$NetBSD: patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2023/07/10 12:01:24 he Exp $
+
+Spec for riscv64.
+
+--- vendor/libc/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig	2023-07-02 20:13:26.244972364 +0000
++++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/riscv64.rs  2023-07-02 20:13:26.244972364 +0000
+@@ -0,0 +1,24 @@
++use PT_FIRSTMACH;
++
++pub type c_long = i64;
++pub type c_ulong = u64;
++pub type c_char = u8;
++pub type __cpu_simple_lock_nv_t = ::c_int;
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 8 - 1;
++    }
++}
++
++// pub const _MAX_PAGE_SHIFT: u32 = 12;
++
++pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
++pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
++pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
++pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;
diff --git a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
index 78c0e1efc179..503c684d23c2 100644
--- a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.9 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.10 2023/07/10 12:01:24 he Exp $
 
 Provide defaults for the various NetBSD targets.
 
@@ -47,8 +47,11 @@ Provide defaults for the various NetBSD targets.
              "powerpc64-unknown-freebsd" => "BSD-generic64",
              "powerpc64-unknown-linux-gnu" => "linux-ppc64",
              "powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -274,6 +282,7 @@ impl Build {
+@@ -272,8 +280,10 @@ impl Build {
+             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+             "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
              "riscv64gc-unknown-linux-gnu" => "linux-generic64",
++            "riscv64gc-unknown-netbsd" => "BSD-generic64",
              "s390x-unknown-linux-gnu" => "linux64-s390x",
              "s390x-unknown-linux-musl" => "linux64-s390x",
 +            "sparc64-unknown-netbsd" => "BSD-generic64",
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 7d7785cfd46e..965478db9324 100644
--- a/lang/rust/patches/patch-vendor_openssl-sys_build_main.rs
+++ b/lang/rust/patches/patch-vendor_openssl-sys_build_main.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_openssl-sys_build_main.rs,v 1.1 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-vendor_openssl-sys_build_main.rs,v 1.2 2023/07/10 12:01:24 he Exp $
 
 Patterned after Linux and Android, on 32-bit NetBSD ports
 include -latomic.  Parts of this inspired by
@@ -6,19 +6,19 @@ https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab
 
 --- vendor/openssl-sys/build/main.rs.orig	2022-11-02 16:21:42.000000000 +0000
 +++ vendor/openssl-sys/build/main.rs
-@@ -117,6 +117,15 @@ fn main() {
-     {
-         println!("cargo:rustc-link-lib=dylib=atomic");
+@@ -122,6 +122,15 @@ fn main() {
+         println!("cargo:rustc-link-lib={}={}", kind, lib);
      }
+ 
 +    // Patterned of the above, make sure we include -latomic
 +    // on ilp32 ports (yes, this only tests the "p32" part).
 +    if kind == "static"
-+        && env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
-+        && env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
++	&& env::var("CARGO_CFG_TARGET_OS").unwrap() == "netbsd"
++	&& env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
 +    {
-+        println!("cargo:rustc-link-lib=dylib=atomic");
++	println!("cargo:rustc-link-lib=dylib=atomic");
 +    }
 +
- 
      if kind == "static" && target.contains("windows") {
          println!("cargo:rustc-link-lib=dylib=gdi32");
+         println!("cargo:rustc-link-lib=dylib=user32");
diff --git a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 1e2f2201d2c2..2622f50c992a 100644
--- a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
+++ b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.9 2023/01/23 18:49:04 he Exp $
+$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.10 2023/07/10 12:01:24 he Exp $
 
-Add aarch64_eb and mipsel for NetBSD.
+Add aarch64_eb, mipsel and riscv64gc for NetBSD.
 
 --- vendor/target-lexicon/src/targets.rs.orig	2021-05-03 21:35:46.000000000 +0000
 +++ vendor/target-lexicon/src/targets.rs
-@@ -1335,6 +1335,7 @@ mod tests {
+@@ -1357,6 +1357,7 @@ mod tests {
              "aarch64-unknown-linux-gnu_ilp32",
              "aarch64-unknown-linux-musl",
              "aarch64-unknown-netbsd",
@@ -12,7 +12,7 @@ Add aarch64_eb and mipsel for NetBSD.
              "aarch64-unknown-none",
              "aarch64-unknown-none-softfloat",
              "aarch64-unknown-openbsd",
-@@ -1423,6 +1424,7 @@ mod tests {
+@@ -1441,6 +1442,7 @@ mod tests {
              "mipsel-unknown-linux-gnu",
              "mipsel-unknown-linux-musl",
              "mipsel-unknown-linux-uclibc",
@@ -20,3 +20,11 @@ Add aarch64_eb and mipsel for NetBSD.
              "mipsel-unknown-none",
              "mipsisa32r6el-unknown-linux-gnu",
              "mipsisa32r6-unknown-linux-gnu",
+@@ -1478,6 +1480,7 @@ mod tests {
+             "riscv64gc-unknown-freebsd",
+             "riscv64gc-unknown-linux-gnu",
+             "riscv64gc-unknown-linux-musl",
++            "riscv64gc-unknown-netbsd",
+             "riscv64gc-unknown-none-elf",
+             "riscv64gc-unknown-openbsd",
+             "riscv64imac-unknown-none-elf",