diff --git a/libc-test/semver/netbsd-riscv64.txt b/libc-test/semver/netbsd-riscv64.txt
new file mode 100644
index 0000000000000..355a4e9885df4
--- /dev/null
+++ b/libc-test/semver/netbsd-riscv64.txt
@@ -0,0 +1,47 @@
+_REG_A0
+_REG_F0
+_REG_FPCSR
+_REG_GP
+_REG_PC
+_REG_RA
+_REG_RV
+_REG_S0
+_REG_SP
+_REG_TP
+_REG_X1
+_REG_X2
+_REG_X3
+_REG_X4
+_REG_X5
+_REG_X6
+_REG_X7
+_REG_X8
+_REG_X9
+_REG_X10
+_REG_X11
+_REG_X12
+_REG_X13
+_REG_X14
+_REG_X15
+_REG_X16
+_REG_X17
+_REG_X18
+_REG_X19
+_REG_X20
+_REG_X21
+_REG_X22
+_REG_X23
+_REG_X24
+_REG_X25
+_REG_X26
+_REG_X27
+_REG_X28
+_REG_X29
+_REG_X30
+_REG_X31
+PT_GETFPREGS
+PT_GETREGS
+PT_SETFPREGS
+PT_SETREGS
+mcontext_t
+ucontext_t
diff --git a/src/unix/bsd/netbsdlike/netbsd/aarch64.rs b/src/unix/bsd/netbsdlike/netbsd/aarch64.rs
index e285d0617ce20..54e648f3c90f9 100644
--- a/src/unix/bsd/netbsdlike/netbsd/aarch64.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/aarch64.rs
@@ -18,14 +18,6 @@ s! {
         pub __fregs: __fregset,
         __spare: [::greg_t; 8],
     }
-
-    pub struct ucontext_t {
-        pub uc_flags: ::c_uint,
-        pub uc_link: *mut ucontext_t,
-        pub uc_sigmask: ::sigset_t,
-        pub uc_stack: ::stack_t,
-        pub uc_mcontext: mcontext_t,
-    }
 }
 
 s_no_extra_traits! {
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index f919b73e5c2f4..8b80208713367 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -777,6 +777,15 @@ s! {
         pub tcpi_snd_zerowin: u32,
         pub __tcpi_pad: [u32; 26],
     }
+
+    #[cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "riscv64"))]
+    pub struct ucontext_t {
+        pub uc_flags: ::c_uint,
+        pub uc_link: *mut ::ucontext_t,
+        pub uc_sigmask: ::sigset_t,
+        pub uc_stack: ::stack_t,
+        pub uc_mcontext: ::mcontext_t,
+    }
 }
 
 s_no_extra_traits! {
diff --git a/src/unix/bsd/netbsdlike/netbsd/x86_64.rs b/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
index a2087c34e43ef..8fc19ec13822a 100644
--- a/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
@@ -12,14 +12,6 @@ s! {
         pub _mc_tlsbase: c___greg_t,
         pub __fpregs: [[::c_char;32]; 16],
     }
-
-    pub struct ucontext_t {
-        pub uc_flags: ::c_uint,
-        pub uc_link: *mut ::ucontext_t,
-        pub uc_sigmask: ::sigset_t,
-        pub uc_stack: ::stack_t,
-        pub uc_mcontext: ::mcontext_t,
-    }
 }
 
 pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;