Skip to content

musl: powerpc64: Fix definition of MAP_LOCKED and MAP_NORESERVE#4516

Merged
tgross35 merged 1 commit intorust-lang:mainfrom
Gelbpunkt:powerpc64-musl-map-locked-noreserve
Jul 3, 2025
Merged

musl: powerpc64: Fix definition of MAP_LOCKED and MAP_NORESERVE#4516
tgross35 merged 1 commit intorust-lang:mainfrom
Gelbpunkt:powerpc64-musl-map-locked-noreserve

Conversation

@Gelbpunkt
Copy link
Contributor

Description

powerpc and powerpc64 have different definitions for these in musl. The powerpc values were correct, but powerpc64 ones were not.

This was changed in musl 1.1.17.

Sources

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

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

powerpc and powerpc64 have different definitions for these in musl.
The powerpc values were correct, but powerpc64 ones were not.

This was changed in musl 1.1.17.

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

Signed-off-by: Jens Reidel <adrian@travitia.xyz>
@tgross35 tgross35 enabled auto-merge July 3, 2025 02:01
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Jul 3, 2025
@tgross35 tgross35 added this pull request to the merge queue Jul 3, 2025
Merged via the queue into rust-lang:main with commit 9da654b Jul 3, 2025
48 of 51 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 29, 2025
powerpc and powerpc64 have different definitions for these in musl.
The powerpc values were correct, but powerpc64 ones were not.

This was changed in musl 1.1.17.

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

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

(backport <rust-lang#4516>)
(cherry picked from commit 5c0742b)
@tgross35 tgross35 mentioned this pull request Jul 29, 2025
github-merge-queue bot pushed a commit that referenced this pull request Jul 29, 2025
powerpc and powerpc64 have different definitions for these in musl.
The powerpc values were correct, but powerpc64 ones were not.

This was changed in musl 1.1.17.

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

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

(backport <#4516>)
(cherry picked from commit 5c0742b)
@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