diff options
| author | bors <bors@rust-lang.org> | 2023-03-13 09:30:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-13 09:30:43 +0000 |
| commit | ad894ac9640faba2f4a93b9a2d039e4303d5899c (patch) | |
| tree | 4a6354d89354cc89bd3ba48700ea4905c8417a53 | |
| parent | 7d6c05045537000710bd56654b7d471abe3f1df6 (diff) | |
| parent | 70b70156360cfe7fa8bbdcc5ca6575bd3dde5be3 (diff) | |
| download | rust-libc-ad894ac9640faba2f4a93b9a2d039e4303d5899c.tar.gz | |
Auto merge of #3140 - sunfishcode:sunfishcode/map-sync-sock-seqpacket, 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.
| -rw-r--r-- | src/unix/linux_like/linux/musl/b32/mips/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/musl/b32/powerpc.rs | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/musl/b64/s390x.rs | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs index 40b507bcd0..d09b8278e5 100644 --- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs @@ -261,6 +261,7 @@ pub const MAP_NORESERVE: ::c_int = 0x0400; pub const MAP_POPULATE: ::c_int = 0x10000; pub const MAP_NONBLOCK: ::c_int = 0x20000; pub const MAP_STACK: ::c_int = 0x40000; +pub const MAP_HUGETLB: ::c_int = 0x80000; pub const EDEADLK: ::c_int = 45; pub const ENAMETOOLONG: ::c_int = 78; @@ -382,8 +383,6 @@ pub const SIG_UNBLOCK: ::c_int = 2; pub const EXTPROC: ::tcflag_t = 0o200000; -pub const MAP_HUGETLB: ::c_int = 0x80000; - pub const F_GETLK: ::c_int = 33; pub const F_GETOWN: ::c_int = 23; pub const F_SETLK: ::c_int = 34; diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs index 5b1bf17ed8..3b998329bb 100644 --- a/src/unix/linux_like/linux/musl/b32/powerpc.rs +++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs @@ -254,6 +254,8 @@ pub const MAP_NORESERVE: ::c_int = 0x00040; pub const MAP_POPULATE: ::c_int = 0x08000; pub const MAP_NONBLOCK: ::c_int = 0x010000; pub const MAP_STACK: ::c_int = 0x020000; +pub const MAP_HUGETLB: ::c_int = 0x040000; +pub const MAP_SYNC: ::c_int = 0x080000; pub const SOCK_STREAM: ::c_int = 1; pub const SOCK_DGRAM: ::c_int = 2; diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index 60bfc8d3e0..d7dcce615c 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -177,6 +177,7 @@ pub const MAP_POPULATE: ::c_int = 0x08000; pub const MAP_NONBLOCK: ::c_int = 0x010000; pub const MAP_STACK: ::c_int = 0x020000; pub const MAP_HUGETLB: ::c_int = 0x040000; +pub const MAP_SYNC: ::c_int = 0x080000; pub const EDEADLOCK: ::c_int = 35; pub const ENAMETOOLONG: ::c_int = 36; |