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

freebsd add MAP_ALIGNED macro
rust-lang · Apr 1, 2023 · 5846917 · 5846917
2 parents 68e06ad + 03eebbf
commit 5846917
Show file tree

Hide file tree

Showing 2 changed files with 15 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;
@@ -4659,6 +4659,18 @@ pub const SCTP_ASSOC_RESET_FAILED: ::c_int = 0x0008;
 pub const SCTP_STREAM_CHANGE_DENIED: ::c_int = 0x0004;
 pub const SCTP_STREAM_CHANGE_FAILED: ::c_int = 0x0008;
 
+cfg_if! {
+    if #[cfg(libc_const_extern_fn)] {
+        pub const fn MAP_ALIGNED(a: ::c_int) -> ::c_int {
+            a << 24
+        }
+    } else {
+        pub fn MAP_ALIGNED(a: ::c_int) -> ::c_int {
+            a << 24
+        }
+    }
+}
+
 const_fn! {
     {const} fn _ALIGN(p: usize) -> usize {
         (p + _ALIGNBYTES) & !_ALIGNBYTES