Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

collinfunk and others added 22 commits July 28, 2025 21:25
(backport <rust-lang#4498>)
(cherry picked from commit afd569f)
(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#4482>)
(cherry picked from commit 34e3b14)
(backport <rust-lang#4482>)
(cherry picked from commit 9220aac)
(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)
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#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)
@rustbot rustbot added A-CI Area: CI-related items ctest Issues relating to the ctest crate O-android O-arm O-bsd O-dragonfly O-gnu O-linux labels Jul 29, 2025
@tgross35 tgross35 changed the base branch from main to libc-0.2 July 29, 2025 02:52
@tgross35 tgross35 closed this Jul 29, 2025
@tgross35 tgross35 reopened this Jul 29, 2025
@tgross35 tgross35 marked this pull request as ready for review July 29, 2025 02:53
@rustbot
Copy link
Collaborator

rustbot commented Jul 29, 2025

Some changes occurred in the Android module

cc @maurer

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

@rustbot
Copy link
Collaborator

rustbot commented Jul 29, 2025

⚠️ Warning ⚠️

  • Pull requests are usually filed against the main branch for this repo, but this one is against libc-0.2. Please double check that you specified the right target!

@tgross35 tgross35 enabled auto-merge July 29, 2025 03:12
@tgross35 tgross35 added this pull request to the merge queue Jul 29, 2025
Merged via the queue into rust-lang:libc-0.2 with commit 46673b8 Jul 29, 2025
88 of 94 checks passed
@tgross35 tgross35 deleted the backport-tabasco branch July 29, 2025 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants