Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SOCK_SEQPACKET and MAP_SYNC on musl powerpc and s390. #3140

Merged

Conversation

sunfishcode
Copy link
Member

  • On powerpc musl, add definitions for MAP_HUGETLB and MAP_SYNC.
  • On powerpc64 musl, add a definition for SOCK_SEQPACKET.
  • On s390x musl, add definitions for SOCK_SEQPACKET and MAP_SYNC.
  • On mips, just move the existing MAP_HUGETLB definition to be near the other MAP_* constants.

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@sunfishcode sunfishcode force-pushed the sunfishcode/map-sync-sock-seqpacket branch 2 times, most recently from 082ed14 to 8a75ed8 Compare March 5, 2023 18:25
@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Mar 12, 2023

📌 Commit 8a75ed8 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 12, 2023

⌛ Testing commit 8a75ed8 with merge dd065c9...

bors added a commit that referenced this pull request Mar 12, 2023
…, r=JohnTitor

Fix `SOCK_SEQPACKET` and `MAP_SYNC` on musl powerpc and s390.

 - On powerpc musl, add definitions for `MAP_HUGETLB` and `MAP_SYNC`.
 - On powerpc64 musl, add a definition for `SOCK_SEQPACKET`.
 - On s390x musl, add definitions for `SOCK_SEQPACKET` and `MAP_SYNC`.
 - On mips, just move the existing `MAP_HUGETLB` definition to be near the other `MAP_*` constants.
@bors
Copy link
Contributor

bors commented Mar 12, 2023

💔 Test failed - checks-actions

 - On powerpc musl, add definitions for `MAP_HUGETLB` and `MAP_SYNC`.
 - On s390x musl, add a definition `MAP_SYNC`.
 - On mips, just move the existing `MAP_HUGETLB` definition to be near
   the other `MAP_*` constants.
@sunfishcode sunfishcode force-pushed the sunfishcode/map-sync-sock-seqpacket branch from 8a75ed8 to 70b7015 Compare March 12, 2023 13:23
@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 13, 2023

📌 Commit 70b7015 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 13, 2023

⌛ Testing commit 70b7015 with merge ad894ac...

@bors
Copy link
Contributor

bors commented Mar 13, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing ad894ac to master...

@bors bors merged commit ad894ac into rust-lang:master Mar 13, 2023
@sunfishcode sunfishcode deleted the sunfishcode/map-sync-sock-seqpacket branch March 13, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants