Skip to content

[0.2] Backports - #4142

Merged
tgross35 merged 16 commits into
rust-lang:libc-0.2from
tgross35:backport-delicata-squash
Nov 25, 2024
Merged

[0.2] Backports#4142
tgross35 merged 16 commits into
rust-lang:libc-0.2from
tgross35:backport-delicata-squash

Conversation

@tgross35

@tgross35tgross35 commented Nov 25, 2024•
edited
Loading

Copy link
Copy Markdown
Member

@rustbot

rustbot commented Nov 25, 2024

Copy link
Copy Markdown
Collaborator

r? @JohnTitor

rustbot has assigned @JohnTitor.
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

@rustbot

rustbot commented Nov 25, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in solarish module

cc @jclulow, @pfmooney

@tgross35
tgross35force-pushed the backport-delicata-squash branch 2 times, most recently from 00fc492 to fd8bf07CompareNovember 25, 2024 10:08
tammelaand others added 8 commits November 25, 2024 04:18
@tammela@tgross35
ci: update musl headers to Linux 6.6
1ae3ff2
Update the musl headers in CI to use alpine-linux instead of sabotage-linux.
Alpine also uses musl but follows the linux stable releases, providing more up-to-date headers.
Signed-off-by: Pedro Tammela <pctammela@gmail.com>
(backport <rust-lang#3921>)
(cherry picked from commit acc75e7)
Signed-off-by: Trevor Gross <tmgross@umich.edu>
@tammela@tgross35
ci: clean up musl exceptions
46316a7
Now that we have Linux 6.6 we can clean up some of the test exceptions.
Not all of them can be removed, so the comments are updated if needed.
Signed-off-by: Pedro Tammela <pctammela@gmail.com>
(backport <rust-lang#3921>)
(cherry picked from commit 55f9451)
Signed-off-by: Trevor Gross <tmgross@umich.edu>
@tgross35
ci: Add back CLONE_CLEAR_SIGHAND and CLONE_INTO_CGROUP skips
8ffe0fa
This bug was fixed in e9abac9 ("Set CLONE_CLEAR_SIGHAND and
CLONE_INTO_CGROUP to a large enough type") and these checks were removed
in acc75e7 ("ci: update musl headers to 6.6"). However, we cannot
backport the fix, so add back the override here.
@folkertdev@tgross35
add ptp_clock_caps
d330ee2
(backport <rust-lang#4128>)
(cherry picked from commit 38318cd)
@pcc@tgross35
Add struct and constants for mount_setattr syscall
2c490f1
(backport <rust-lang#4046>)
(cherry picked from commit d691ee7)
@tgross35
style: Allow rustfmt to organize imports
0d0a745
Add `group_imports` and `import_granularity` to our rustfmt config.
These values are the same as in rust-lang/rust.
(backport <rust-lang#4136>)
(cherry picked from commit 0456dcb)
@tgross35
style: Run cargo fmt with the new configuration
da089f7
`libc-0.2` version of 236e069 from [1]
(not a direct cherry pick).
[1]: rust-lang#4136
@neuschaefer@tgross35
linux_like: Unify statx definitions
c1cdf7b
The statx system call and corresponding constants are defined by the
Linux kernel and don't depend on the libc or architecture. The only
difference is whether a libc exports the statx syscall wrapper or not.
We can thus unify the statx definitions for all Linux "like" platforms:
GNU (glibc), Android (bionic), and (in a later commit) musl.
Plain u64 (or uint64_t in C) can't be used for the statx fields because
bionic defines them as __u64, and provides incompatible definitions of
uint64_t and __u64.
(backport <rust-lang#3978>)
(cherry picked from commit e46bbe4)
tgross35and others added 8 commits November 25, 2024 04:18
@tgross35
apple: remove if_family_id
fe4def5
This API appears to not be available in more recent MacOS SDKs, and
there aren't any functions that use it. Since this hasn't yet made it
into a release, remove it.
Link: rust-lang#4022
(backport <rust-lang#4137>)
(cherry picked from commit e87acba)
@tgross35
musl: Reorganize some statfs-related types for a cleaner diff
036c68f
This moves similar types together (e.g. statfs and statfs64) so removing
them is cleaner.
Co-authored-by: Andy Caldwell <andycaldwell@microsoft.com>
(backport <rust-lang#3261>)
(cherry picked from commit 6c0952e)
@bossmc@tgross35
musl: Unify definitions of siginfo_t
8189016
Musl provides a single definition for `siginfo_t` [1] with the order of
`si_code` and `si_errno` controlled by `__SI_SWAP_ERRNO_CODE`. This is
only set on mips (both 32- and 64-bit).
[1]: https://github.com/kraj/musl/blob/ffb23aef7b5339b8c3234f4c6a93c488dc873919/include/signal.h#L99-L147
[ extracted from "Remove all redundant definitions in musl backend", add
context to the commit message - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit e1ff5d6)
@bossmc@tgross35
musl: Unify definitions of statvfs and statvfs64
0300828
`statvfs` already exists in `musl/mod.rs`. Use that were possible and
move a common version of `statvfs64` there.
[ reduce this patch to only cover statvfs*, leaving statfs as a separate
change - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit adcc84d)
@bossmc@tgross35
musl: Unify definitions of statfs and statfs64
ace85ee
Only mips uses a special statfs(64)
[ squash "Use `#[cfg]` blocks to special-case statfs on mips", change
this patch to only cover statfs and statfs64, include part of "Remove
new redundant definitions" - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit fb7785a)
@bossmc@tgross35
musl: Remove redundant definitions
ee8ef64
These types are redundant as they are exported from higher-level
modules.
[ move some non-statfs fixups here from other commits in the series, add
context to the commmit message - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit b196045)
@bossmc@tgross35
musl: Rename fields to match musl headers
cbc560d
[ squash "Re-add explicit padding in 32-bit statvfs", reword commit
summary - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit d210d71)
@bossmc@tgross35
glibc: Remove redundant definitions
2018bca
These are redundant as they are exported from higher-level modules.
[ extract this commit to only cover glibc - Trevor ]
(backport <rust-lang#3261>)
(cherry picked from commit ca7eedd)
@tgross35
tgross35force-pushed the backport-delicata-squash branch from fd8bf07 to 2018bcaCompareNovember 25, 2024 10:18
@tgross35

tgross35 commented Nov 25, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Note to self, gh pr list --state merged --label stable-nominated --json 'mergedAt,number' --jq 'sort_by(.mergedAt)' --limit 400 | jq '.[].number' | xargs -IPR_NUM gh pr view PR_NUM --json 'author,url, title,mergedAt,number,commits' --jq '.login = .author.login | .author = .author.name | .commits = (.commits | map({oid, messageHeadline})) | .msg = "(backport <" + .url + ">)"' is great for finding PRs that need a backport

@tgross35
tgross35 added this pull request to the merge queueNov 25, 2024
Merged via the queue into rust-lang:libc-0.2 with commit b07e28dNov 25, 2024
@tgross35
tgross35 deleted the backport-delicata-squash branch November 25, 2024 10:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@JohnTitorJohnTitor

Labels

O-androidO-armO-gnuO-illumosO-linuxO-linux-likeO-macosO-mipsO-muslO-riscvO-solarishO-sparcO-unixO-wasiO-x86S-waiting-on-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@tgross35@rustbot@JohnTitor@tammela@folkertdev@pcc@neuschaefer@bossmc