Skip to content

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Sep 21, 2025

@rustbot
Copy link
Collaborator

rustbot commented Sep 21, 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!

This is done in `ctest_cfg` on `libc-0.2` to account for thread local
use on Dragonfly. I should have done this in the cherry pick that added
the function (the "Fixes" commit below) but missed it. Thus, add it now.

Fixes: 3a650df ("libc: port freebsd to use ctest-next")
semarie and others added 7 commits September 20, 2025 19:37
(backport <rust-lang#4653>)
(cherry picked from commit 0ebbafd)
[ some significant resolution needed due to API removed in 0.2 - Trevor ]
https://git.musl-libc.org/cgit/musl/tree/arch/s390x/bits/statfs.h

statfs64 is the same as statfs on musl-libc, so it can also be a type alias on
the Rust side.

https://git.musl-libc.org/cgit/musl/tree/include/sys/statfs.h#n21

(backport <rust-lang#4549>)
(cherry picked from commit dd6f54c)
glibc provides these symbols, but musl does not.

(backport <rust-lang#4549>)
(cherry picked from commit da77f0f)
musl-libc does not implement sysctl.

(backport <rust-lang#4549>)
(cherry picked from commit 751f3b6)
SYS_mseal is not yet defined in musl-libc, but it can only take one
possible value, dictated by the kernel's syscall ABI.

(backport <rust-lang#4549>)
(cherry picked from commit 6a13fd5)
Previously, the definition was only changed for glibc but not for musl.

Fixes: 051fa61 ("Make `fpreg_t` an union")

(backport <rust-lang#4549>)
(cherry picked from commit 2e670a8)
@rustbot rustbot added the A-CI Area: CI-related items label Sep 21, 2025
@tgross35 tgross35 enabled auto-merge September 21, 2025 00:51
@tgross35 tgross35 disabled auto-merge September 21, 2025 01:05
(backport <rust-lang#4655>)
(cherry picked from commit b185a13)
@rustbot rustbot added the ctest Issues relating to the ctest crate label Sep 22, 2025
@tgross35 tgross35 force-pushed the backport-adzuki branch 2 times, most recently from ce6b11c to ec73ed1 Compare September 22, 2025 01:15
@tgross35 tgross35 enabled auto-merge September 22, 2025 01:16
mbyx and others added 4 commits September 21, 2025 21:30
(backport <rust-lang#4655>)
(cherry picked from commit 4439546)
[ drop everything related to the actual ctest-next impl. Some other
  Cargo.toml adjustments were needed. - Trevor ]
(backport <rust-lang#4659>)
(cherry picked from commit 3f2a3ab)
On `main` we require that the tier 1 tests pass before running tier 2
jobs in an effort to avoid spending CI time when things would fail smoke
checks. `libc-0.2` has a bit of a different flow though: most PRs are
bulk backports that contain a number of patches which have already been
validated once on `main`.

To speed up the backport process a bit, remove `needs:` so all jobs
start at the same time.
@tgross35 tgross35 added this pull request to the merge queue Sep 22, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 22, 2025
@tgross35 tgross35 added this pull request to the merge queue Sep 22, 2025
Merged via the queue into rust-lang:libc-0.2 with commit a0225a0 Sep 22, 2025
49 of 50 checks passed
@tgross35 tgross35 deleted the backport-adzuki branch September 22, 2025 02:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: CI-related items ctest Issues relating to the ctest crate O-linux O-musl O-redox O-unix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants