diff options
| author | bors <bors@rust-lang.org> | 2014-08-05 00:01:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-05 00:01:28 +0000 |
| commit | 6bb72600cc139d18ed3606cec32bfec40f360fa3 (patch) | |
| tree | 99bcdd53def13814d1659c9f47cd2d207d7be12a /src | |
| parent | 463d6680d17380228dfea509b19b1ff67d50eafc (diff) | |
| parent | 6aca20564fcc7ceb0f6463976d14249384066c5b (diff) | |
| download | rust-6bb72600cc139d18ed3606cec32bfec40f360fa3.tar.gz rust-6bb72600cc139d18ed3606cec32bfec40f360fa3.zip | |
auto merge of #16179 : SimonPersson/rust/master, r=brson
This should solve issue 14848 for ARM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-pass/intrinsic-alignment.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/rec-align-u64.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index 197b92ba635..f90cc8146c0 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -33,6 +33,7 @@ mod m { #[main] #[cfg(target_arch = "x86_64")] + #[cfg(target_arch = "arm")] pub fn main() { unsafe { assert_eq!(::rusti::pref_align_of::<u64>(), 8u); diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index ada012fc2f5..da40f000ae2 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -48,6 +48,7 @@ mod m { } #[cfg(target_arch = "x86_64")] + #[cfg(target_arch = "arm")] pub mod m { pub fn align() -> uint { 8u } pub fn size() -> uint { 16u } |