---

vadimcn · vadimcn · commit 61a286b12abd · 2014-08-04T18:27:24.000-07:00
yaml --- r: 126391 b: refs/heads/try c: cb55279 h: refs/heads/master i: 126389: 45f6018 126387: 3d04876 126383: 032bdd4 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 2a47fa708cfbf6b90a8ffacbaf00b8250bfa72cd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: 5a24ee8a9ef1bb3bf250ce39902cf8dfca1a4dea
+refs/heads/try: cb55279f2378c8f3e8528c8c4c8a0f67d6955cb1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/test/run-pass/intrinsic-alignment.rs b/branches/try/src/test/run-pass/intrinsic-alignment.rs
@@ -51,6 +51,15 @@ mod m {
             assert_eq!(::rusti::min_align_of::<u64>(), 8u);
         }
     }
+
+    #[main]
+    #[cfg(target_arch = "x86_64")]
+    pub fn main() {
+        unsafe {
+            assert_eq!(::rusti::pref_align_of::<u64>(), 8u);
+            assert_eq!(::rusti::min_align_of::<u64>(), 8u);
+        }
+    }
 }
 
 #[cfg(target_os = "android")]
diff --git a/branches/try/src/test/run-pass/rec-align-u64.rs b/branches/try/src/test/run-pass/rec-align-u64.rs
@@ -61,6 +61,12 @@ mod m {
         pub fn align() -> uint { 8u }
         pub fn size() -> uint { 16u }
     }
+
+    #[cfg(target_arch = "x86_64")]
+    pub mod m {
+        pub fn align() -> uint { 8u }
+        pub fn size() -> uint { 16u }
+    }
 }
 
 #[cfg(target_os = "android")]

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,15 @@ mod m {`
`51`	`51`	`assert_eq!(::rusti::min_align_of::<u64>(), 8u);`
`52`	`52`	`}`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ #[main]`
	`56`	`+ #[cfg(target_arch = "x86_64")]`
	`57`	`+ pub fn main() {`
	`58`	`+ unsafe {`
	`59`	`+ assert_eq!(::rusti::pref_align_of::<u64>(), 8u);`
	`60`	`+ assert_eq!(::rusti::min_align_of::<u64>(), 8u);`
	`61`	`+ }`
	`62`	`+ }`
`54`	`63`	`}`
`55`	`64`
`56`	`65`	`#[cfg(target_os = "android")]`