Skip to content

Commit afc977f

Browse files
committed
Merge branch 'android-run-pass' of https://github.com/malbarbo/rust into rollup
2 parents e684525 + c199cb5 commit afc977f

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

src/test/run-pass/intrinsic-alignment.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ mod rusti {
1919
}
2020
}
2121

22-
#[cfg(any(target_os = "cloudabi",
22+
#[cfg(any(target_os = "android",
23+
target_os = "cloudabi",
2324
target_os = "dragonfly",
2425
target_os = "emscripten",
2526
target_os = "freebsd",
@@ -80,15 +81,3 @@ mod m {
8081
}
8182
}
8283
}
83-
84-
#[cfg(target_os = "android")]
85-
mod m {
86-
#[main]
87-
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
88-
pub fn main() {
89-
unsafe {
90-
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
91-
assert_eq!(::rusti::min_align_of::<u64>(), 8);
92-
}
93-
}
94-
}

src/test/run-pass/rec-align-u64.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ struct Outer {
3838
}
3939

4040

41-
#[cfg(any(target_os = "cloudabi",
41+
#[cfg(any(target_os = "android",
42+
target_os = "cloudabi",
4243
target_os = "dragonfly",
4344
target_os = "emscripten",
4445
target_os = "freebsd",
@@ -85,15 +86,6 @@ mod m {
8586
}
8687
}
8788

88-
#[cfg(target_os = "android")]
89-
mod m {
90-
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
91-
pub mod m {
92-
pub fn align() -> usize { 8 }
93-
pub fn size() -> usize { 16 }
94-
}
95-
}
96-
9789
pub fn main() {
9890
unsafe {
9991
let x = Outer {c8: 22, t: Inner {c64: 44}};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn main() {
3535
unsafe {
3636
// Install signal hander that runs on alternate signal stack.
3737
let mut action: sigaction = std::mem::zeroed();
38-
action.sa_flags = SA_SIGINFO | SA_ONSTACK;
38+
action.sa_flags = (SA_ONSTACK | SA_SIGINFO) as _;
3939
action.sa_sigaction = signal_handler as sighandler_t;
4040
sigaction(SIGWINCH, &action, std::ptr::null_mut());
4141

0 commit comments

Comments
 (0)