---

yaml
---
r: 106078
b: refs/heads/auto
c: 87e72c3
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2a5e04c2a427b00051424b916d9e306f0de470cd
+refs/heads/auto: 87e72c38122cbd24199365232217ca8c15ebe995
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/compile-fail/asm-misplaced-option.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 // ignore-fast #[feature] doesn't work with check-fast
+// ignore-android
+
 #[feature(asm)];
 
 #[allow(dead_code)];
@@ -33,9 +35,6 @@ pub fn main() {
     assert_eq!(x, 13);
 }
 
-// #[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
-// pub fn main() {}
-
 // At least one error is needed so that compilation fails
 #[static_assert]
 static b: bool = false; //~ ERROR static assertion failed