-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[0.2] Backports #4592
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
Merged
Merged
[0.2] Backports #4592
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(backport <rust-lang#4498>) (cherry picked from commit afd569f)
(backport <rust-lang#4498>) (cherry picked from commit 82d508f)
(backport <rust-lang#4498>) (cherry picked from commit c5ddc70)
(backport <rust-lang#4498>) (cherry picked from commit 483e331)
Our `style.sh` script can't handle these easily, and it seems like `ctest` may struggle with this macro. Add the `enum` keyword so the expanded code is valid Rust. (backport <rust-lang#4494>) (cherry picked from commit 19e04c8)
(backport <rust-lang#4502>) (cherry picked from commit cbcd344)
(backport <rust-lang#4482>) (cherry picked from commit 8443057)
(backport <rust-lang#4482>) (cherry picked from commit 7d2a695)
(backport <rust-lang#4482>) (cherry picked from commit 34e3b14)
(backport <rust-lang#4482>) (cherry picked from commit 9220aac)
…older (backport <rust-lang#4482>) (cherry picked from commit db4dba7)
(backport <rust-lang#4507>) (cherry picked from commit fa6a299)
musl defines nlink_t to be an unsigned 32-bit integer on mips64, therefore changing the size of stat64 from 216 bytes to 208. The current definition in the libc crate does not match this and therefore defines stat64 wrong on mips64 musl, which results in bogus readings of fields following st_nlink. See https://git.musl-libc.org/cgit/musl/tree/arch/mips64/bits/alltypes.h.in#n22 for the musl definition of nlink_t. Signed-off-by: Jens Reidel <[email protected]> (backport <rust-lang#4509>) (cherry picked from commit 02eff0f)
musl has its own definition of the fanotify_event_metadata struct and doesn't use the one from the Linux kernel. The difference here is that musl's mask field has the type unsigned long long, while the kernel uses __u64. This currently causes libc-test to fail to compile on musl targets. Linux: https://github.com/torvalds/linux/blob/master/include/uapi/linux/fanotify.h#L143 musl: https://git.musl-libc.org/cgit/musl/tree/include/sys/fanotify.h#n15 Signed-off-by: Jens Reidel <[email protected]> (backport <rust-lang#4510>) (cherry picked from commit 7559ba1)
The Linux kernel only defines MAP_32BIT in the asm/mman.h header on x86. Remove the erraneous definitions for any other architectures on Linux targets. See https://github.com/torvalds/linux/blob/master/arch/x86/include/uapi/asm/mman.h#L5 This makes libc-test somewhat compile on powerpc64le musl. Signed-off-by: Jens Reidel <[email protected]> (backport <rust-lang#4511>) (cherry picked from commit 9332d56)
(backport <rust-lang#4503>) (cherry picked from commit 64bfc7d)
See: https://github.com/torvalds/linux/blob/master/include/uapi/linux/securebits.h (backport <rust-lang#4480>) (cherry picked from commit f811577)
Since 1.80 these, along with their `_val` versions, are in the default `core` prelude so they don't need to be imported. 1.80 exceeds our MSRV so we can't use it from there, but we can add it to our prelude for now. (backport <rust-lang#4532>) (cherry picked from commit 26a5ea6)
`cargo fmt` was being called twice without `--check`, so style was only enforced on files that got checked individually. Remove the redundant call and add `--check` here. (backport <rust-lang#4533>) (cherry picked from commit 1187328)
(backport <rust-lang#4533>) (cherry picked from commit 5b14b89)
(backport <rust-lang#4535>) (cherry picked from commit ae97728)
A recent change has replaced an unused preprocessor symbol: P_UNUSED3 freebsd/freebsd-src@33be163 Another recent change has changed the size of a spare field: mc_spare freebsd/freebsd-src@eea3e4d (backport <rust-lang#4488>) (cherry picked from commit 46b90a8)
|
Merged
via the queue into
rust-lang:libc-0.2
with commit Jul 29, 2025
46673b8
88 of 94 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport the following:
enum
keyword to thec_enum
macro #4494core::mem::{size_of, align_of}
to the prelude #4532--check
tocargo fmt
run in CI #4533