freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15

neuschaefer · tgross35 · commit ba11a59c5a4d · 2025-09-19T14:31:49.000Z
mcontext_t::mc_tlsbase was introduced in FreeBSD 15, in commit eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext"). freebsd/freebsd-src@eea3e4d (backport <#4640>) (cherry picked from commit 3d93bf5)
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
@@ -98,6 +98,7 @@ s_no_extra_traits! {
     }
 
     #[repr(align(16))]
+    #[non_exhaustive]
     pub struct mcontext_t {
         pub mc_onstack: register_t,
         pub mc_rdi: register_t,
@@ -136,7 +137,11 @@ s_no_extra_traits! {
         pub mc_gsbase: register_t,
         pub mc_xfpustate: register_t,
         pub mc_xfpustate_len: register_t,
+        #[cfg(any(freebsd12, freebsd13, freebsd14))]
+        pub mc_spare: [c_long; 4],
+        #[cfg(freebsd15)]
         pub mc_tlsbase: register_t,
+        #[cfg(freebsd15)]
         pub mc_spare: [c_long; 3],
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ s_no_extra_traits! {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`#[repr(align(16))]`
	`101`	`+ #[non_exhaustive]`
`101`	`102`	`pub struct mcontext_t {`
`102`	`103`	`pub mc_onstack: register_t,`
`103`	`104`	`pub mc_rdi: register_t,`
`@@ -136,7 +137,11 @@ s_no_extra_traits! {`
`136`	`137`	`pub mc_gsbase: register_t,`
`137`	`138`	`pub mc_xfpustate: register_t,`
`138`	`139`	`pub mc_xfpustate_len: register_t,`
	`140`	`+ #[cfg(any(freebsd12, freebsd13, freebsd14))]`
	`141`	`+ pub mc_spare: [c_long; 4],`
	`142`	`+ #[cfg(freebsd15)]`
`139`	`143`	`pub mc_tlsbase: register_t,`
	`144`	`+ #[cfg(freebsd15)]`
`140`	`145`	`pub mc_spare: [c_long; 3],`
`141`	`146`	`}`
`142`	`147`	`}`