Test fixes from the rollup

6 files changed, 28 insertions, 27 deletions

diff --git a/src/librustc/middle/trans/intrinsic.rs b/src/librustc/middle/trans/intrinsic.rs
index 36184b2eed3..3b3d7d02a2c 100644
--- a/src/librustc/middle/trans/intrinsic.rs
+++ b/src/librustc/middle/trans/intrinsic.rs
@@ -11,7 +11,7 @@
 #![allow(non_uppercase_statics)]
 
 use llvm;
-use llvm::{SequentiallyConsistent, Acquire, Release, Xchg, ValueRef};
+use llvm::{SequentiallyConsistent, Acquire, Release, AtomicXchg, ValueRef};
 use middle::subst;
 use middle::subst::FnSpace;
 use middle::trans::base::*;
@@ -510,17 +510,17 @@ pub fn trans_intrinsic_call<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, node: ast::N
                 // These are all AtomicRMW ops
                 op => {
                     let atom_op = match op {
-                        "xchg"  => llvm::Xchg,
-                        "xadd"  => llvm::Add,
-                        "xsub"  => llvm::Sub,
-                        "and"   => llvm::And,
-                        "nand"  => llvm::Nand,
-                        "or"    => llvm::Or,
-                        "xor"   => llvm::Xor,
-                        "max"   => llvm::Max,
-                        "min"   => llvm::Min,
-                        "umax"  => llvm::UMax,
-                        "umin"  => llvm::UMin,
+                        "xchg"  => llvm::AtomicXchg,
+                        "xadd"  => llvm::AtomicAdd,
+                        "xsub"  => llvm::AtomicSub,
+                        "and"   => llvm::AtomicAnd,
+                        "nand"  => llvm::AtomicNand,
+                        "or"    => llvm::AtomicOr,
+                        "xor"   => llvm::AtomicXor,
+                        "max"   => llvm::AtomicMax,
+                        "min"   => llvm::AtomicMin,
+                        "umax"  => llvm::AtomicUMax,
+                        "umin"  => llvm::AtomicUMin,
                         _ => ccx.sess().fatal("unknown atomic operation")
                     };
 
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
index f722a5d260d..22e7ec6124f 100644
--- a/src/librustc_llvm/lib.rs
+++ b/src/librustc_llvm/lib.rs
@@ -297,17 +297,17 @@ pub enum TypeKind {
 
 #[repr(C)]
 pub enum AtomicBinOp {
-    Xchg = 0,
-    Add  = 1,
-    Sub  = 2,
-    And  = 3,
-    Nand = 4,
-    Or   = 5,
-    Xor  = 6,
-    Max  = 7,
-    Min  = 8,
-    UMax = 9,
-    UMin = 10,
+    AtomicXchg = 0,
+    AtomicAdd  = 1,
+    AtomicSub  = 2,
+    AtomicAnd  = 3,
+    AtomicNand = 4,
+    AtomicOr   = 5,
+    AtomicXor  = 6,
+    AtomicMax  = 7,
+    AtomicMin  = 8,
+    AtomicUMax = 9,
+    AtomicUMin = 10,
 }
 
 #[repr(C)]
diff --git a/src/test/compile-fail/borrowck-closures-unique.rs b/src/test/compile-fail/borrowck-closures-unique.rs
index 80d942e58d1..61c77ce7bba 100644
--- a/src/test/compile-fail/borrowck-closures-unique.rs
+++ b/src/test/compile-fail/borrowck-closures-unique.rs
@@ -43,7 +43,7 @@ fn d(x: &mut int) {
 }
 
 fn e(x: &mut int) {
-    let c1: || = || x = fail!(); //~ ERROR closure cannot assign to immutable argument `x`
+    let c1: || = || x = fail!(); //~ ERROR closure cannot assign to immutable local variable
 }
 
 fn main() {
diff --git a/src/test/compile-fail/borrowck-unboxed-closures.rs b/src/test/compile-fail/borrowck-unboxed-closures.rs
index 03438b1d7e1..5f9dd72f5bf 100644
--- a/src/test/compile-fail/borrowck-unboxed-closures.rs
+++ b/src/test/compile-fail/borrowck-unboxed-closures.rs
@@ -17,7 +17,7 @@ fn a<F:Fn(int, int) -> int>(mut f: F) {
 }
 
 fn b<F:FnMut(int, int) -> int>(f: F) {
-    f(1, 2);    //~ ERROR cannot borrow immutable argument
+    f(1, 2);    //~ ERROR cannot borrow immutable local variable
 }
 
 fn c<F:FnOnce(int, int) -> int>(f: F) {
diff --git a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs
index 431ae1b13dd..c5cfabd74e1 100644
--- a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs
+++ b/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-stage1
+// ignore-android
 // aux-build:issue_16723_multiple_items_syntax_ext.rs
 #![feature(phase)]
 
diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/run-pass/tag-align-dyn-u64.rs
index 0fc20ef66b3..d6a154edd78 100644
--- a/src/test/run-pass/tag-align-dyn-u64.rs
+++ b/src/test/run-pass/tag-align-dyn-u64.rs
@@ -14,7 +14,7 @@
 use std::mem;
 
 enum Tag<A> {
-    Tag(A)
+    Tag2(A)
 }
 
 struct Rec {
@@ -23,7 +23,7 @@ struct Rec {
 }
 
 fn mk_rec() -> Rec {
-    return Rec { c8:0u8, t:Tag(0u64) };
+    return Rec { c8:0u8, t:Tag2(0u64) };
 }
 
 fn is_8_byte_aligned(u: &Tag<u64>) -> bool {