auto merge of #16179 : SimonPersson/rust/master, r=brson

This should solve issue 14848 for ARM.

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);

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 }