Skip to content

Fix CI on FreeBSD 13/14 #4640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 11, 2025
Merged

Fix CI on FreeBSD 13/14 #4640

merged 2 commits into from
Aug 11, 2025

Conversation

neuschaefer
Copy link
Contributor

@neuschaefer neuschaefer commented Aug 11, 2025 •
edited
Loading

Description

This is an attempt to get the CI green again on FreeBSD.

FreeBSD 13 i686 unfortunately still fails a test:

failures:
    test_skip_simple

I haven't investigated the cause, but it's 32-bit specific.

Sources

P_IDLEPROC:

  • introduced in FreeBSD 15: commit 33be1632047c ("racct: Fix accounting of CPU time for the system idle process")

mcontext::mc_tlsbase:

  • introduced in FreeBSD 15: commit eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext")

Links are in the commit messages

Checklist

  • Relevant tests in libc-test/semver have been updated none needed, I think
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

@neuschaefer neuschaefer changed the title Fix CI on FreeBSD 12/13/14 Fix CI on FreeBSD 13/14 Aug 11, 2025
tgross35
tgross35 reviewed Aug 11, 2025
View reviewed changes
@neuschaefer
freebsd: Limit P_IDLEPROC to FreeBSD 15
327a2dd 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163
@neuschaefer
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
eb181c1 
mcontext_t::mc_tlsbase was introduced in FreeBSD 15, in commit
eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext").

freebsd/freebsd-src@eea3e4d
@neuschaefer neuschaefer marked this pull request as ready for review August 11, 2025 21:06
tgross35
tgross35 approved these changes Aug 11, 2025
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@tgross35 tgross35 enabled auto-merge August 11, 2025 21:09
@tgross35 tgross35 added this pull request to the merge queue Aug 11, 2025
Merged via the queue into rust-lang:main with commit 3d93bf5 Aug 11, 2025
50 of 52 checks passed
@neuschaefer neuschaefer deleted the freebsd14 branch August 11, 2025 22:14
@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 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit P_IDLEPROC to FreeBSD 15
fb20785 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163

(backport <rust-lang#4640>)
(cherry picked from commit ac0e2b6)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
c417ef9 
mcontext_t::mc_tlsbase was introduced in FreeBSD 15, in commit
eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext").

freebsd/freebsd-src@eea3e4d

(backport <rust-lang#4640>)
(cherry picked from commit 3d93bf5)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit P_IDLEPROC to FreeBSD 15
fae8a61 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163

(backport <rust-lang#4640>)
(cherry picked from commit ac0e2b6)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
368c678 
mcontext_t::mc_tlsbase was introduced in FreeBSD 15, in commit
eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext").

freebsd/freebsd-src@eea3e4d

(backport <rust-lang#4640>)
(cherry picked from commit 3d93bf5)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit P_IDLEPROC to FreeBSD 15
b817118 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163

(backport <rust-lang#4640>)
(cherry picked from commit ac0e2b6)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
096579c 
mcontext_t::mc_tlsbase was introduced in FreeBSD 15, in commit
eea3e4dd9703 ("amd64: add mc_tlsbase member to mcontext").

freebsd/freebsd-src@eea3e4d

(backport <rust-lang#4640>)
(cherry picked from commit 3d93bf5)
@tgross35 tgross35 mentioned this pull request Sep 19, 2025
Merged
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit P_IDLEPROC to FreeBSD 15
8b33c02 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163

(backport <#4640>)
(cherry picked from commit ac0e2b6)
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
cfce653 
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)
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit P_IDLEPROC to FreeBSD 15
49225ce 
`P_IDLEPROC` was introduced in FreeBSD 15, in commit 33be1632047c
("racct: Fix accounting of CPU time for the system idle process").

freebsd/freebsd-src@33be163

(backport <#4640>)
(cherry picked from commit ac0e2b6)
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2025
@neuschaefer @tgross35
freebsd: Limit mcontext_t::mc_tlsbase to FreeBSD 15
ba11a59 
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)
@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
Reviewers

@tgross35 tgross35 tgross35 approved these changes

Assignees
No one assigned
Labels
O-unix O-x86 stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neuschaefer @tgross35 @rustbot