New upstream version 1.25.0+dfsg1

[rustc.git] / src / test / run-pass / rec-align-u64.rs

diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs
index d051e05b5f9e72c04255f0e5ac7eba87e8b76b78..85c1b2adb79ec058c800ec27ebb9daec19040776 100644 (file)
--- a/src/test/run-pass/rec-align-u64.rs
+++ b/src/test/run-pass/rec-align-u64.rs
@@ -38,14 +38,16 @@ struct Outer {
 }
 
 
-#[cfg(any(target_os = "linux",
-          target_os = "macos",
-          target_os = "freebsd",
+#[cfg(any(target_os = "android",
+          target_os = "cloudabi",
           target_os = "dragonfly",
+          target_os = "emscripten",
+          target_os = "freebsd",
+          target_os = "linux",
+          target_os = "macos",
           target_os = "netbsd",
           target_os = "openbsd",
-          target_os = "solaris",
-          target_os = "emscripten"))]
+          target_os = "solaris"))]
 mod m {
     #[cfg(target_arch = "x86")]
     pub mod m {
@@ -84,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}};