Jika/acid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on aarch64

Browse Source
This commit is contained in:
Jeremy Soller
2022-08-28 10:09:45 -06:00
parent ccf01b6f39
commit d9959bb3f5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@@ -7,6 +7,8 @@ edition = "2018"
[dependencies]
libc = "0.2"
redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git" }
strace = { git = "https://gitlab.redox-os.org/redox-os/strace-redox", default-features = false }
x86 = "0.47.0"
#strace = { git = "https://gitlab.redox-os.org/redox-os/strace-redox", default-features = false }
#strace = { path = "../../strace/source", default-features = false }
[target.'cfg(target_arch = "x86_64")'.dependencies]
x86 = "0.47.0"

7
src/main.rs
View File

@@ -3,6 +3,8 @@
mod clone_grant_using_fmap;
const PAGE_SIZE: usize = 4096;
fn e<T, E: ToString>(error: Result<T, E>) -> Result<T, String> {
error.map_err(|e| e.to_string())
}
@@ -45,9 +47,6 @@ fn create_test() -> Result<(), String> {
Ok(())
}
#[cfg(target_arch = "x86_64")]
const PAGE_SIZE: usize = 4096;
fn page_fault_test() -> Result<(), String> {
use std::sync::atomic::{AtomicUsize, compiler_fence, Ordering};
@@ -114,6 +113,7 @@ fn page_fault_test() -> Result<(), String> {
Ok(())
}
#[cfg(target_arch = "x86_64")]
fn switch_test() -> Result<(), String> {
use std::thread;
use x86::time::rdtscp;
@@ -246,6 +246,7 @@ fn main() {
let mut tests: BTreeMap<&'static str, fn() -> Result<(), String>> = BTreeMap::new();
tests.insert("create_test", create_test);
tests.insert("page_fault", page_fault_test);
#[cfg(target_arch = "x86_64")]
tests.insert("switch", switch_test);
tests.insert("tcp_fin", tcp_fin_test);
tests.insert("thread", thread_test);