From 9f18495b0db0e9eb7c71d69f7e2fb9a6294b652a Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Mon, 29 Dec 2025 11:43:22 +0000 Subject: [PATCH 1/2] netbsd/mod.rs: change definition of pthread_spin_t to allow arch redefinition. --- src/unix/bsd/netbsdlike/netbsd/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index f04997cf5aea7..58c71f40142fb 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -14,7 +14,7 @@ pub type idtype_t = c_int; type __pthread_spin_t = __cpu_simple_lock_nv_t; pub type shmatt_t = c_uint; pub type cpuset_t = _cpuset; -pub type pthread_spin_t = c_uchar; +pub type pthread_spin_t = __pthread_spin_t; // elf.h From 1711c4251f1e38c3e1556e66f0975109cc5643d6 Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Mon, 29 Dec 2025 11:45:49 +0000 Subject: [PATCH 2/2] netbsd/arm.rs: make typo corrections which make the libc-test pass. --- src/unix/bsd/netbsdlike/netbsd/arm.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/unix/bsd/netbsdlike/netbsd/arm.rs b/src/unix/bsd/netbsdlike/netbsd/arm.rs index 9ff44bd40826a..1af255ea8ae63 100644 --- a/src/unix/bsd/netbsdlike/netbsd/arm.rs +++ b/src/unix/bsd/netbsdlike/netbsd/arm.rs @@ -7,8 +7,8 @@ pub(crate) const _ALIGNBYTES: usize = size_of::() - 1; pub const PT_GETREGS: c_int = PT_FIRSTMACH + 1; pub const PT_SETREGS: c_int = PT_FIRSTMACH + 2; -pub const PT_GETFPREGS: c_int = PT_FIRSTMACH + 3; -pub const PT_SETFPREGS: c_int = PT_FIRSTMACH + 4; +pub const PT_GETFPREGS: c_int = PT_FIRSTMACH + 5; +pub const PT_SETFPREGS: c_int = PT_FIRSTMACH + 6; pub const _REG_R0: c_int = 0; pub const _REG_R1: c_int = 1; @@ -61,10 +61,10 @@ pub const _REG_X30: c_int = 30; pub const _REG_X31: c_int = 31; pub const _REG_ELR: c_int = 32; pub const _REG_SPSR: c_int = 33; -pub const _REG_TIPDR: c_int = 34; +pub const _REG_TPIDR: c_int = 34; pub const _REG_RV: c_int = _REG_R0; pub const _REG_FP: c_int = _REG_R11; -pub const _REG_LR: c_int = _REG_R13; -pub const _REG_SP: c_int = _REG_R14; +pub const _REG_SP: c_int = _REG_R13; +pub const _REG_LR: c_int = _REG_R14; pub const _REG_PC: c_int = _REG_R15;