Skip to content

Commit 54b0cbf

Browse files
committed
auto merge of #6020 : yichoi/rust/pull-0423, r=brson
fix for missing ARM support to pass make stage of rpass
2 parents da601be + 8eb22ec commit 54b0cbf

9 files changed

+31
-0
lines changed

src/test/run-pass/bitwise.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212

1313
#[cfg(target_arch = "x86")]
14+
#[cfg(target_arch = "arm")]
1415
fn target() {
1516
assert!((-1000 as uint >> 3u == 536870787u));
1617
}

src/test/run-pass/conditional-compile-arch.rs

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ pub fn main() { }
1313

1414
#[cfg(target_arch = "x86_64")]
1515
pub fn main() { }
16+
17+
#[cfg(target_arch = "arm")]
18+
pub fn main() { }

src/test/run-pass/dupe-first-attr.rc

+3
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ mod hello;
2222

2323
#[cfg(target_os = "freebsd")]
2424
mod hello;
25+
26+
#[cfg(target_os = "android")]
27+
mod hello;

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

+11
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,14 @@ mod m {
4949
}
5050
}
5151
}
52+
53+
#[cfg(target_os = "android")]
54+
mod m {
55+
#[cfg(target_arch = "arm")]
56+
pub fn main() {
57+
unsafe {
58+
assert!(::rusti::pref_align_of::<u64>() == 8u);
59+
assert!(::rusti::min_align_of::<u64>() == 4u);
60+
}
61+
}
62+
}

src/test/run-pass/issue-2895.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ pub fn main() {
2727
}
2828

2929
#[cfg(target_arch = "x86")]
30+
#[cfg(target_arch = "arm")]
3031
pub fn main() {
3132
assert!((sys::size_of::<Cat>() == 4 as uint));
3233
assert!((sys::size_of::<Kitty>() == 8 as uint));

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

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ struct Outer {
3232

3333

3434
#[cfg(target_arch = "x86")]
35+
#[cfg(target_arch = "arm")]
3536
mod m {
3637
pub fn align() -> uint { 4u }
3738
pub fn size() -> uint { 8u }

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

+9
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ mod m {
5757
}
5858
}
5959

60+
#[cfg(target_os = "android")]
61+
mod m {
62+
#[cfg(target_arch = "arm")]
63+
pub mod m {
64+
pub fn align() -> uint { 4u }
65+
pub fn size() -> uint { 12u }
66+
}
67+
}
68+
6069
pub fn main() {
6170
unsafe {
6271
let x = Outer {c8: 22u8, t: Inner {c64: 44u64}};

src/test/run-pass/struct-return.rs

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ fn test2() {
5656
}
5757

5858
#[cfg(target_arch = "x86")]
59+
#[cfg(target_arch = "arm")]
5960
fn test2() {
6061
}
6162

src/test/run-pass/x86stdcall2.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ pub fn main() {
4040
#[cfg(target_os = "macos")]
4141
#[cfg(target_os = "linux")]
4242
#[cfg(target_os = "freebsd")]
43+
#[cfg(target_os = "android")]
4344
pub fn main() { }

0 commit comments

Comments
 (0)