Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/atomic/atomic_others.ll

Index: test/Transforms/NaCl/atomic/atomic_others.ll
diff --git a/test/Transforms/NaCl/atomic/atomic_others.ll b/test/Transforms/NaCl/atomic/atomic_others.ll
index a510d45a54a41888cc38cc7a1505f7d7d4cd384a..ae2498340fdf9b0f00a3b71151c4db4b3322b054 100644
--- a/test/Transforms/NaCl/atomic/atomic_others.ll
+++ b/test/Transforms/NaCl/atomic/atomic_others.ll
@@ -13,7 +13,7 @@ target datalayout = "p:32:32:32"
 ; CHECK-LABEL: @test_atomic_load_monotonic_i32
 define i32 @test_atomic_load_monotonic_i32(i32* %ptr) {
   ; CHECK-NEXT: %res = call i32 @llvm.nacl.atomic.load.i32(i32* %ptr, i32 6)
-  %res = load atomic i32* %ptr monotonic, align 4
+  %res = load atomic i32, i32* %ptr monotonic, align 4
   ret i32 %res  ; CHECK-NEXT: ret i32 %res
 }
 
@@ -27,7 +27,7 @@ define void @test_atomic_store_monotonic_i32(i32* %ptr, i32 %value) {
 ; CHECK-LABEL: @test_atomic_load_unordered_i32
 define i32 @test_atomic_load_unordered_i32(i32* %ptr) {
   ; CHECK-NEXT: %res = call i32 @llvm.nacl.atomic.load.i32(i32* %ptr, i32 6)
-  %res = load atomic i32* %ptr unordered, align 4
+  %res = load atomic i32, i32* %ptr unordered, align 4
   ret i32 %res  ; CHECK-NEXT: ret i32 %res
 }
 
@@ -41,7 +41,7 @@ define void @test_atomic_store_unordered_i32(i32* %ptr, i32 %value) {
 ; CHECK-LABEL: @test_atomic_load_acquire_i32
 define i32 @test_atomic_load_acquire_i32(i32* %ptr) {
   ; CHECK-NEXT: %res = call i32 @llvm.nacl.atomic.load.i32(i32* %ptr, i32 3)
-  %res = load atomic i32* %ptr acquire, align 4
+  %res = load atomic i32, i32* %ptr acquire, align 4
   ret i32 %res  ; CHECK-NEXT: ret i32 %res
 }