Skip to content

Conversation

tgross35
Copy link
Contributor

freebsd11 wasn't covered, meaning test failures on the 0.2 branch. Add freebsd11 to the pattern, and use cfg(not(...)) rather than cfg(freebsd15). (Ideally this would instead be encoded as something like cfg(freebsd_least_15).)

Fixes: 3d93bf5 ("freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15")

freebsd11 wasn't covered, meaning test failures on the 0.2 branch. Add freebsd11 to the pattern, and use `cfg(not(...))` rather than `cfg(freebsd15)`. (Ideally this would instead be encoded as something like `cfg(freebsd_least_15)`.) Fixes: 3d93bf5 ("freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15")
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Sep 19, 2025
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
freebsd11 wasn't covered, meaning test failures on the 0.2 branch. Add freebsd11 to the pattern, and use `cfg(not(...))` rather than `cfg(freebsd15)`. (Ideally this would instead be encoded as something like `cfg(freebsd_least_15)`.) Fixes: 3d93bf5 ("freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15") (backport <rust-lang#4703>) (cherry picked from commit abbde1d)
@tgross35 tgross35 enabled auto-merge September 19, 2025 06:42
@tgross35 tgross35 added this pull request to the merge queue Sep 19, 2025
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
freebsd11 wasn't covered, meaning test failures on the 0.2 branch. Add freebsd11 to the pattern, and use `cfg(not(...))` rather than `cfg(freebsd15)`. (Ideally this would instead be encoded as something like `cfg(freebsd_least_15)`.) Fixes: 3d93bf5 ("freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15") (backport <rust-lang#4703>) (cherry picked from commit d8b90d6)
@tgross35 tgross35 mentioned this pull request Sep 19, 2025
Merged via the queue into rust-lang:main with commit d8b90d6 Sep 19, 2025
51 of 52 checks passed
@tgross35 tgross35 deleted the freebsd-mcontext branch September 19, 2025 07:35
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2025
freebsd11 wasn't covered, meaning test failures on the 0.2 branch. Add freebsd11 to the pattern, and use `cfg(not(...))` rather than `cfg(freebsd15)`. (Ideally this would instead be encoded as something like `cfg(freebsd_least_15)`.) Fixes: 3d93bf5 ("freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15") (backport <#4703>) (cherry picked from commit d8b90d6)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Sep 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-unix O-x86 stable-applied This PR has been cherry-picked to libc's stable release branch

2 participants