Several fixes for Linux/musl/s390x by neuschaefer · Pull Request #4549 · rust-lang/libc

neuschaefer · 2025-07-15T20:43:02Z

Description

This PR updates several APIs with respect to their definitions in musl-libc.

Sources

Links are included in the commit messages.

Checklist

Relevant tests in libc-test/semver have been updated
No placeholder or unstable values like *LAST or *MAX are
included (see #3131)
Tested locally (cd libc-test && cargo test --target mytarget);
especially relevant for platforms that may not be checked in CI

neuschaefer · 2025-07-15T20:46:52Z

@tgross35 I probably missed some of the finer details of version tracking in the libc crate. I'm looking forward to your (and/or someone else's) review

tgross35

Sorry for the delay, been a bit behind on libc. Just a few small things

neuschaefer · 2025-08-12T13:23:59Z

@tgross35 this is ready for review again

tgross35 · 2025-08-12T19:41:27Z

 s_no_extra_traits! {
-    // FIXME(union): This is actually a union.
-    pub struct fpreg_t {
+    pub union fpreg_t {
        pub d: c_double,
-        // f: c_float,
+        pub f: c_float,
    }
 }


Noting to self that this patch won't get backported

tgross35

Thanks! As always, I appreciate the clean+detailed commits

tgross35

From the CI failure, looks like this needs an update to the PartialEq implementation

neuschaefer · 2025-08-13T12:27:57Z

From the CI failure, looks like this needs an update to the PartialEq implementation

Good point. I'll follow 051fa61 and make the traits unimplemented

tgross35

Thanks!

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

glibc provides these symbols, but musl does not.

musl-libc does not implement sysctl.

SYS_mseal is not yet defined in musl-libc, but it can only take one possible value, dictated by the kernel's syscall ABI.

Previously, the definition was only changed for glibc but not for musl. Fixes: 051fa61 ("Make `fpreg_t` an union")

neuschaefer · 2025-08-14T00:40:49Z

rebased to trigger rebuild after android CI failure. @tgross35 sorry if this throws a wrench into the review flow

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)

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)

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)

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 <#4549>) (cherry picked from commit dd6f54c)

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

musl-libc does not implement sysctl. (backport <#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 <#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 <#4549>) (cherry picked from commit 2e670a8)

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 <#4549>) (cherry picked from commit dd6f54c)

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

musl-libc does not implement sysctl. (backport <#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 <#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 <#4549>) (cherry picked from commit 2e670a8)

This PR fixes compilation against libc 0.2.176 on s390x-unknown-linux-musl. libc 0.2.176 fixed the definitions of statfs to align them with musl, see rust-lang/libc#4549 for the PR that fixed it. Signed-off-by: Jens Reidel <adrian@travitia.xyz>

rustbot added O-linux O-musl O-unix S-waiting-on-review labels Jul 15, 2025

neuschaefer force-pushed the s390x-statfs branch from c280654 to 62da8b9 Compare July 16, 2025 15:24

tgross35 requested changes Aug 10, 2025

View reviewed changes

Comment thread src/unix/linux_like/linux/mod.rs

Comment thread src/unix/linux_like/linux/musl/b64/s390x.rs Outdated

neuschaefer force-pushed the s390x-statfs branch 3 times, most recently from adbe903 to e3f7cad Compare August 12, 2025 13:20

tgross35 reviewed Aug 12, 2025

View reviewed changes

tgross35 approved these changes Aug 12, 2025

View reviewed changes

tgross35 enabled auto-merge August 12, 2025 19:41

tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 12, 2025

tgross35 requested changes Aug 13, 2025

View reviewed changes

auto-merge was automatically disabled August 13, 2025 12:39
Head branch was pushed to by a user without write access

neuschaefer force-pushed the s390x-statfs branch from e3f7cad to 31ee4fc Compare August 13, 2025 12:39

tgross35 approved these changes Aug 13, 2025

View reviewed changes

tgross35 enabled auto-merge August 13, 2025 20:11

neuschaefer added 5 commits August 14, 2025 02:39

linux-musl: Specialize struct statfs[64] for s390x

0fc84d2

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

semver: Move some pthreads symbols to linux-gnu-s390x.txt

3e1ae37

glibc provides these symbols, but musl does not.

semver: Move sysctl to linux-gnu-s390x.txt

6e6456a

musl-libc does not implement sysctl.

linux-musl-s390x: Add SYS_mseal

1c0aeaa

SYS_mseal is not yet defined in musl-libc, but it can only take one possible value, dictated by the kernel's syscall ABI.

linux-musl-s390x: Make fpreg_t a union

82bf1d8

Previously, the definition was only changed for glibc but not for musl. Fixes: 051fa61 ("Make `fpreg_t` an union")

auto-merge was automatically disabled August 14, 2025 00:40
Head branch was pushed to by a user without write access

neuschaefer force-pushed the s390x-statfs branch from 31ee4fc to 82bf1d8 Compare August 14, 2025 00:40

tgross35 added this pull request to the merge queue Aug 14, 2025

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 21, 2025

semver: Move sysctl to linux-gnu-s390x.txt

bc5033e

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

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 21, 2025

semver: Move some pthreads symbols to linux-gnu-s390x.txt

3a83f37

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

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 21, 2025

semver: Move sysctl to linux-gnu-s390x.txt

526eb0b

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

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 21, 2025

semver: Move some pthreads symbols to linux-gnu-s390x.txt

f7736d1

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

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 21, 2025

semver: Move sysctl to linux-gnu-s390x.txt

0764f8f

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

tgross35 mentioned this pull request Sep 21, 2025

[0.2] Backports #4705

Merged

github-merge-queue Bot pushed a commit that referenced this pull request Sep 22, 2025

semver: Move some pthreads symbols to linux-gnu-s390x.txt

deef774

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

github-merge-queue Bot pushed a commit that referenced this pull request Sep 22, 2025

semver: Move sysctl to linux-gnu-s390x.txt

4f4dd96

musl-libc does not implement sysctl. (backport <#4549>) (cherry picked from commit 751f3b6)

github-merge-queue Bot pushed a commit that referenced this pull request Sep 22, 2025

semver: Move some pthreads symbols to linux-gnu-s390x.txt

3749d98

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

github-merge-queue Bot pushed a commit that referenced this pull request Sep 22, 2025

semver: Move sysctl to linux-gnu-s390x.txt

2733b30

musl-libc does not implement sysctl. (backport <#4549>) (cherry picked from commit 751f3b6)

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Sep 22, 2025

saschagrunert mentioned this pull request Sep 23, 2025

Upgrade from 0.2.175 to 0.2.176 breaks s390x build #4718

Closed

Gelbpunkt mentioned this pull request Sep 23, 2025

statfs: Fix definitions for s390x musl with libc 0.2.176 nix-rust/nix#2678

Merged

3 tasks

Navigation Menu

Uh oh!

Several fixes for Linux/musl/s390x - #4549

Several fixes for Linux/musl/s390x#4549
tgross35 merged 5 commits into
rust-lang:mainfrom
neuschaefer:s390x-statfs

neuschaefer commented Jul 15, 2025

Uh oh!

neuschaefer commented Jul 15, 2025

Uh oh!

tgross35 left a comment

Uh oh!

Uh oh!

Uh oh!

neuschaefer commented Aug 12, 2025

Uh oh!

tgross35 Aug 12, 2025

Uh oh!

tgross35 left a comment

Uh oh!

tgross35 left a comment •

edited

Loading

Uh oh!

neuschaefer commented Aug 13, 2025

Uh oh!

tgross35 left a comment

Uh oh!

neuschaefer commented Aug 14, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

neuschaefer commented Jul 15, 2025

Description

Sources

Checklist

Uh oh!

neuschaefer commented Jul 15, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

neuschaefer commented Aug 12, 2025

Uh oh!

tgross35 Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

tgross35 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

neuschaefer commented Aug 13, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

neuschaefer commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tgross35 left a comment •

edited

Loading

neuschaefer commented Aug 14, 2025 •

edited

Loading