Skip to content

Commit

Permalink
Auto merge of #3313 - devnexen:linux_mman_aarch64_upd, r=JohnTitor
Browse files Browse the repository at this point in the history
linux glibc/musl and android adding PROT_BTI/PROT_MTE mmap flags for …

…arm64.
  • Loading branch information
bors committed Aug 19, 2023
2 parents 92a5d3e + cbeb1bd commit 9447d17
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions libc-test/semver/android-aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ HWCAP2_SVEBITPERM
HWCAP2_SVEPMULL
HWCAP2_SVESHA3
HWCAP2_SVESM4
PROT_BTI
PROT_MTE
SYS_arch_specific_syscall
SYS_syscalls
SYS_fcntl
Expand Down
3 changes: 3 additions & 0 deletions src/unix/linux_like/android/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9447d17

Please sign in to comment.