nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-10 06:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'android-run-pass' of https://github.com/malbarbo/rust into rollup

Browse Source
This commit is contained in:
Alex Crichton 2018-01-26 06:52:36 -08:00
commit afc977fa23
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/run-pass/intrinsic-alignment.rs
View File

@ -19,7 +19,8 @@ mod rusti {
}
}
#[cfg(any(target_os = "cloudabi",
#[cfg(any(target_os = "android",
target_os = "cloudabi",
target_os = "dragonfly",
target_os = "emscripten",
target_os = "freebsd",
@ -80,15 +81,3 @@ mod m {
}
}
}
#[cfg(target_os = "android")]
mod m {
#[main]
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
pub fn main() {
unsafe {
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
assert_eq!(::rusti::min_align_of::<u64>(), 8);
}
}
}

12
src/test/run-pass/rec-align-u64.rs
View File

@ -38,7 +38,8 @@ struct Outer {
}
#[cfg(any(target_os = "cloudabi",
#[cfg(any(target_os = "android",
target_os = "cloudabi",
target_os = "dragonfly",
target_os = "emscripten",
target_os = "freebsd",
@ -85,15 +86,6 @@ mod m {
}
}
#[cfg(target_os = "android")]
mod m {
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
pub mod m {
pub fn align() -> usize { 8 }
pub fn size() -> usize { 16 }
}
}
pub fn main() {
unsafe {
let x = Outer {c8: 22, t: Inner {c64: 44}};

2
src/test/run-pass/signal-alternate-stack-cleanup.rs
View File

@ -35,7 +35,7 @@ fn main() {
unsafe {
// Install signal hander that runs on alternate signal stack.
let mut action: sigaction = std::mem::zeroed();
action.sa_flags = SA_SIGINFO | SA_ONSTACK;
action.sa_flags = (SA_ONSTACK | SA_SIGINFO) as _;
action.sa_sigaction = signal_handler as sighandler_t;
sigaction(SIGWINCH, &action, std::ptr::null_mut());