Auto merge of #3313 - devnexen:linux_mman_aarch64_upd, r=JohnTitor

linux glibc/musl and android adding PROT_BTI/PROT_MTE mmap flags for … …arm64.
rust-lang · Aug 17, 2023 · 5b666ff · 5b666ff
2 parents 92a5d3e + 1b8d0b1
commit 5b666ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/libc-test/semver/android-aarch64.txt b/libc-test/semver/android-aarch64.txt
@@ -7,6 +7,8 @@ HWCAP2_SVEBITPERM
 HWCAP2_SVEPMULL
 HWCAP2_SVESHA3
 HWCAP2_SVESM4
+PROT_BTI
+PROT_MTE
 SYS_arch_specific_syscall
 SYS_syscalls
 SYS_fcntl

diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs
@@ -412,6 +412,9 @@ pub const SYS_fsmount: ::c_long = 432;
 pub const SYS_fspick: ::c_long = 433;
 pub const SYS_syscalls: ::c_long = 436;
 
+pub const PROT_BTI: ::c_int = 0x10;
+pub const PROT_MTE: ::c_int = 0x20;
+
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;

diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -902,6 +902,9 @@ pub const SYS_process_mrelease: ::c_long = 448;
 pub const SYS_futex_waitv: ::c_long = 449;
 pub const SYS_set_mempolicy_home_node: ::c_long = 450;
 
+pub const PROT_BTI: ::c_int = 0x10;
+pub const PROT_MTE: ::c_int = 0x20;
+
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,

diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
@@ -645,6 +645,9 @@ pub const IEXTEN: ::tcflag_t = 0x00008000;
 pub const TOSTOP: ::tcflag_t = 0x00000100;
 pub const FLUSHO: ::tcflag_t = 0x00001000;
 
+pub const PROT_BTI: ::c_int = 0x10;
+pub const PROT_MTE: ::c_int = 0x20;
+
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;