Auto merge of #3167 - devnexen:fbsd_map_aligned, r=JohnTitor

freebsd add MAP_ALIGNED macro
rust-lang · Mar 27, 2023 · eb1e6c3 · eb1e6c3
2 parents 9ac18cd + 4d4b6d0
commit eb1e6c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -702,6 +702,8 @@ MALLOCX_ARENA
 MALLOCX_ALIGN
 MALLOCX_TCACHE
 MALLOCX_ZERO
+MAP_ALIGNED
+MAP_ALIGNED_SUPER
 MAP_COPY
 MAP_EXCL
 MAP_FILE

diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -2664,7 +2664,7 @@ pub const Q_SETQUOTA: ::c_int = 0x800;
 pub const MAP_GUARD: ::c_int = 0x00002000;
 pub const MAP_EXCL: ::c_int = 0x00004000;
 pub const MAP_PREFAULT_READ: ::c_int = 0x00040000;
-pub const MAP_ALIGNED_SUPER: ::c_int = 1 << 24;
+pub const MAP_ALIGNED_SUPER: ::c_int = MAP_ALIGNED(1);
 
 pub const POSIX_FADV_NORMAL: ::c_int = 0;
 pub const POSIX_FADV_RANDOM: ::c_int = 1;
@@ -4813,6 +4813,10 @@ safe_f! {
     pub {const} fn PR_SCTP_VALID_POLICY(x: ::c_int) -> bool {
         PR_SCTP_POLICY(x) <= SCTP_PR_SCTP_MAX
     }
+
+    pub {const} fn MAP_ALIGNED(a: ::c_int) -> ::c_int {
+        a << 24
+    }
 }
 
 cfg_if! {