rust185: fix the ability to bootstrap natively on riscv64.

[Havard Eidnes (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Fri Feb 28 14:48:56 2025 +0000
Changeset:	aca5c906ac807088f0f2d44cec1a1238df732516

Modified Files:
	rust185/Makefile
	rust185/distinfo
Added Files:
	rust185/patches/patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

Log Message:
rust185: fix the ability to bootstrap natively on riscv64.

This is done by transferring and simplifying the pattern
from the patch to the libc-0.2.169 crate to the libc-0.2.167
crate, which is being built as part of the bootstrap.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aca5c906ac807088f0f2d44cec1a1238df732516

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust185/Makefile                                   |  2 +
 rust185/distinfo                                   |  1 +
 ...2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 43 ++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diffs:
diff --git a/rust185/Makefile b/rust185/Makefile
index 145bb11db9..b3e06d8acf 100644
--- a/rust185/Makefile
+++ b/rust185/Makefile
@@ -454,6 +454,8 @@ CKSUMS+=	2b6c62850c168e7200955ba1f52464fa03c329df7a4e77a30054544280308dc1
 CKSUMS+=	ce9b6fb7a2c7377e6cfbe882f7195736baf20408559d4259f2ef70c160872024
 CKSUMS+=	742d6c0607ee20c81a2184a6378dc2d9c18f7180a0dc93aa91f830a0d1a06878
 CKSUMS+=	4f39616cd4010e5ac122d1162e022af0d0304f361cf718d5997819b666f8eb26
+CKSUMS+=	81664f910e884d70f0a758c42a17cc242db4811ce9dda1257fbd66b291cf0d52
+CKSUMS+=	d3bead33c12d072f930d0165dcfde27bfe1bb9309cf70f5bb76e7e0bd62e82fb
 
 CKSUM_CRATES+=	vendor/libc-0.2.169
 CKSUMS+=	dc216609dfc6b2835e26f8c3e70f4c7c65425933eef04538de603f51e9429ec5
diff --git a/rust185/distinfo b/rust185/distinfo
index 2dac55a571..3d96d9a20f 100644
--- a/rust185/distinfo
+++ b/rust185/distinfo
@@ -145,6 +145,7 @@ SHA1 (patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs) = 97505b88875aa80fa2b5
 SHA1 (patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 6ca30a6873bc2ce462a9ed640e72e586b5e7db0b
 SHA1 (patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs) = 194bd1dbbc568cc596ab5c58a7ea3ee5c88a804c
 SHA1 (patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 2cfc335e8ac0855fe04ffb1b870771b085316655
+SHA1 (patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 90e8f680f831985f993ee34266fafb5233aaaa58
 SHA1 (patch-vendor_libc-0.2.167_src_unix_solarish_mod.rs) = e4304cbfdad03c7da68ab95260af3a07bdde7b64
 SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 02c4efefbf1e9e1bd98eb9524515677250ae7454
 SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = c5e1c2d896d5e9d32aeb56bc3e4d9fb26be9edf0
diff --git a/rust185/patches/patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust185/patches/patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..5bdabbf317
--- /dev/null
+++ b/rust185/patches/patch-vendor_libc-0.2.167_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,43 @@
+$NetBSD$
+
+Unbreak this module.
+Patterned and simplified after patch to vendor/libc-0.2.169..
+This one is used during bootstrap build on riscv64.
+
+--- vendor/libc-0.2.167/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig	2025-02-17 18:17:27.000000000 +0000
++++ vendor/libc-0.2.167/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,4 +1,4 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+ 
+ use crate::prelude::*;
+ 
+@@ -8,15 +8,7 @@ pub type c_char = u8;
+ pub type __greg_t = u64;
+ pub type __cpu_simple_lock_nv_t = c_int;
+ pub type __gregset = [__greg_t; _NGREG];
+-pub type __fregset = [__freg; _NFREG];
+-
+-s! {
+-    pub struct mcontext_t {
+-        pub __gregs: __gregset,
+-        pub __fregs: __fpregset,
+-        __spare: [crate::__greg_t; 7],
+-    }
+-}
++pub type __fregset = [__fpreg; _NFREG];
+ 
+ s_no_extra_traits! {
+     #[cfg_attr(feature = "extra_traits", allow(missing_debug_implementations))]
+@@ -24,6 +16,11 @@ s_no_extra_traits! {
+         pub u_u64: u64,
+         pub u_d: c_double,
+     }
++    pub struct mcontext_t {
++        pub __gregs: __gregset,
++        pub __fregs: __fregset,
++        __spare: [crate::__greg_t; 7],
++    }
+ }
+ 
+ pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_long>() - 1;