From 4ccc99faec7000cfaefa4feab3a26d52435c3cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thoralf=20M=C3=BCller?= Date: Fri, 6 Oct 2023 14:04:27 +0200 Subject: [PATCH] Fix compilation for armv7-unknown-linux-gnueabihf target --- .../armv7-unknown-linux-gnueabihf-compatibility.md | 5 +++++ engine/runtime/src/memories/frag.rs | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .changes/armv7-unknown-linux-gnueabihf-compatibility.md diff --git a/.changes/armv7-unknown-linux-gnueabihf-compatibility.md b/.changes/armv7-unknown-linux-gnueabihf-compatibility.md new file mode 100644 index 000000000..97115153c --- /dev/null +++ b/.changes/armv7-unknown-linux-gnueabihf-compatibility.md @@ -0,0 +1,5 @@ +--- +"stronghold-runtime": patch +--- + +Fixed compilation for armv7-unknown-linux-gnueabihf target. \ No newline at end of file diff --git a/engine/runtime/src/memories/frag.rs b/engine/runtime/src/memories/frag.rs index 0b8bfbfc9..6b76e1432 100644 --- a/engine/runtime/src/memories/frag.rs +++ b/engine/runtime/src/memories/frag.rs @@ -218,8 +218,9 @@ where let default_page_size = 0x1000i64; + #[allow(clippy::useless_conversion)] let pagesize = nix::unistd::sysconf(nix::unistd::SysconfVar::PAGE_SIZE) - .unwrap_or(Some(default_page_size)) + .unwrap_or(Some(default_page_size.try_into().unwrap())) .unwrap() as usize; info!("Using page size {}", pagesize); @@ -257,7 +258,7 @@ where return Err(MemoryError::Allocation("Memory mapping failed".to_string())); } - #[cfg(any(target_os = "macos"))] + #[cfg(target_os = "macos")] { // on linux this isn't required to commit memory let error = libc::madvise(&mut addr as *mut usize as *mut libc::c_void, size, libc::MADV_WILLNEED); @@ -374,8 +375,9 @@ where // pick a default, if system api call is not successful let default_page_size = 0x1000i64; + #[allow(clippy::useless_conversion)] let _pagesize = nix::unistd::sysconf(nix::unistd::SysconfVar::PAGE_SIZE) - .unwrap_or(Some(default_page_size)) + .unwrap_or(Some(default_page_size.try_into().unwrap())) .unwrap() as usize; // We allocate a sufficiently "large" chunk of memory. A random @@ -420,7 +422,7 @@ where #[cfg(any(target_os = "linux", target_os = "macos"))] fn dealloc(frag: &mut Frag) -> Result<(), Self::Error> { - dealloc_direct(frag.info.0 as *mut libc::c_void) + dealloc_direct(frag.info.0) } #[cfg(target_os = "windows")]