Skip to content

Conversation

neuschaefer
Copy link
Contributor

Description

This change removes two constants from s390x.rs that are not present in musl-libc. This moves the libc testsuite closer to running successfully on s390x-linux-musl.

Sources

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

musl-libc does not define RTLD_DEEPBIND on any architecture.

Fixes: 88de388 ("add definitions for s390x musl targets")
musl-libc does not define O_FSYNC on any architecture, since commit
v1.1.15-15-gc1f4ed15 (committed 2016-08-30):

  https://git.musl-libc.org/cgit/musl/commit/?id=c1f4ed150137d793c9d07356305a89e8785e7e02

Fixes: 88de388 ("add definitions for s390x musl targets")
@tgross35
Copy link
Contributor

tgross35 commented Jul 3, 2025

Could you deprecate these rather than removing them? Obviously nobody should be using them, but we should give a bit of a migration path for anyone who isn't configuring these out on s390x.

You can add a FIXME(s390x) skip in the tests until we can actually remove them.

@neuschaefer
Copy link
Contributor Author

Could you deprecate these rather than removing them? Obviously nobody should be using them, but we should give a bit of a migration path for anyone who isn't configuring these out on s390x.

Sure, I'll deprecate them instead. What should I use as the version number for the since parameter?

You can add a FIXME(s390x) skip in the tests until we can actually remove them.

I'll do that.

Thanks!

@tgross35
Copy link
Contributor

tgross35 commented Jul 3, 2025

Sure, I'll deprecate them instead. What should I use as the version number for the since parameter?

This will get in the next release, which will be 0.2.175. Thank you!

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You know what, I missed that this is the musl target which is tier 3. I think we can just go forward with what you have here.

@tgross35 tgross35 added this pull request to the merge queue Jul 3, 2025
Merged via the queue into rust-lang:main with commit f8dae7d Jul 3, 2025
92 of 98 checks passed
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Jul 8, 2025
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025
musl-libc does not define RTLD_DEEPBIND on any architecture.

Fixes: 88de388 ("add definitions for s390x musl targets")

(backport <rust-lang#4515>)
(cherry picked from commit 6faa6d3)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025
musl-libc does not define O_FSYNC on any architecture, since commit
v1.1.15-15-gc1f4ed15 (committed 2016-08-30):

  https://git.musl-libc.org/cgit/musl/commit/?id=c1f4ed150137d793c9d07356305a89e8785e7e02

Fixes: 88de388 ("add definitions for s390x musl targets")

(backport <rust-lang#4515>)
(cherry picked from commit a5b89d3)
@tgross35 tgross35 mentioned this pull request Jul 29, 2025
github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025
musl-libc does not define RTLD_DEEPBIND on any architecture.

Fixes: 88de388 ("add definitions for s390x musl targets")

(backport <#4515>)
(cherry picked from commit 6faa6d3)
github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025
musl-libc does not define O_FSYNC on any architecture, since commit
v1.1.15-15-gc1f4ed15 (committed 2016-08-30):

  https://git.musl-libc.org/cgit/musl/commit/?id=c1f4ed150137d793c9d07356305a89e8785e7e02

Fixes: 88de388 ("add definitions for s390x musl targets")

(backport <#4515>)
(cherry picked from commit a5b89d3)
@tgross35 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 Jul 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-linux O-musl O-unix stable-applied This PR has been cherry-picked to libc's stable release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants