Skip to content
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.

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

Fix the definition of struct stat on 32-bit FreeBSD 12+ #3946

Merged
merged 2 commits into from
Oct 2, 2024

Conversation

asomers
Copy link
Contributor

@asomers asomers commented Sep 27, 2024

This is a rebase #3939 onto the main branch.

@rustbot
Copy link
Collaborator

rustbot commented Sep 27, 2024

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@bors
Copy link
Contributor

bors commented Oct 1, 2024

☔ The latest upstream changes (presumably 4ce03da) made this pull request unmergeable. Please resolve the merge conflicts.

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.

Ah sorry for the delay, this lgtm but needs a rebase now

Commit 7437d0a erroneously defined it as "ulong" instead of u64.
Nobody noticed the mistake, probably because it was only tested on
64-bit architectures, where those are equivalent.  But it's a problem
now, after rust-lang#3723 , which switched the standard library to a FreeBSD 12
ABI.

Issue rust-lang/rust#130677
The original definitions were never correct.  But nobody noticed because
we don't do CI on 32-bit FreeBSD.  The problem is apparent now due to
 rust-lang#3723 , which caused the nightly toolchain to switch to a FreeBSD 12
ABI.

Fixes rust-lang/rust#130677
@asomers asomers requested a review from tgross35 October 2, 2024 15:01
@tgross35 tgross35 added this pull request to the merge queue Oct 2, 2024
Merged via the queue into rust-lang:main with commit 0e9c6f3 Oct 2, 2024
41 checks passed
@asomers asomers deleted the main-stat32 branch October 3, 2024 15:32
@tgross35 tgross35 added the stable-applied This PR has been cherry-picked to libc's stable release branch label Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants