Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/resolve-pnacl-intrinsics.ll

 ; RUN: opt < %s -resolve-pnacl-intrinsics -S | FileCheck %s \
 ; RUN:   -check-prefix=CLEANED
 ; RUN: opt < %s -resolve-pnacl-intrinsics -S | FileCheck %s
 
 ; CLEANED-NOT: call i32 @llvm.nacl.setjmp
 ; CLEANED-NOT: call void @llvm.nacl.longjmp
 ; CLEANED-NOT: call {{.*}} @llvm.nacl.atomic
 
 declare i32 @llvm.nacl.setjmp(i8*)
 declare void @llvm.nacl.longjmp(i8*, i32)
@@ skipping 37 matching lines @@
 define void @call_longjmp(i8* %arg, i32 %num) {
   call void @llvm.nacl.longjmp(i8* %arg, i32 %num)
 ; CHECK: call void @longjmp(i8* %arg, i32 %num){{$}}
   ret void
 }
 
 ; atomics.
 
 ; CHECK-LABEL: @test_atomic_acquire
 define i32 @test_atomic_acquire(i32* %ptr) {
-  ; CHECK: %1 = load atomic i32* %ptr acquire, align 4
+  ; CHECK: %1 = load atomic i32, i32* %ptr acquire, align 4
   %1 = call i32 @llvm.nacl.atomic.load.i32(i32* %ptr, i32 3)
   ret i32 %1
 }
 
 ; CHECK-LABEL: @test_atomic_release
 define void @test_atomic_release(i32* %ptr, i32 %value) {
   ; CHECK: store atomic i32 %value, i32* %ptr release, align 4
   call void @llvm.nacl.atomic.store.i32(i32 %value, i32* %ptr, i32 4)
   ret void
 }
@@ skipping 160 matching lines @@
 ; CHECK-LABEL: @test_lock_release_i32
 define void @test_lock_release_i32(i32* %ptr) {
   ; Note that the 'release' was changed to a 'seq_cst'.
   ; CHECK: store atomic i32 0, i32* %ptr seq_cst, align 4
   call void @llvm.nacl.atomic.store.i32(i32 0, i32* %ptr, i32 6)
   ret void
 }
 
 ; CHECK-LABEL: @test_atomic_load_i8
 define zeroext i8 @test_atomic_load_i8(i8* %ptr) {
-  ; CHECK: %1 = load atomic i8* %ptr seq_cst, align 1
+  ; CHECK: %1 = load atomic i8, i8* %ptr seq_cst, align 1
   %1 = call i8 @llvm.nacl.atomic.load.i8(i8* %ptr, i32 6)
   ret i8 %1
 }
 
 ; CHECK-LABEL: @test_atomic_store_i8
 define void @test_atomic_store_i8(i8* %ptr, i8 zeroext %value) {
   ; CHECK: store atomic i8 %value, i8* %ptr seq_cst, align 1
   call void @llvm.nacl.atomic.store.i8(i8 %value, i8* %ptr, i32 6)
   ret void
 }
 
 ; CHECK-LABEL: @test_atomic_load_i16
 define zeroext i16 @test_atomic_load_i16(i16* %ptr) {
-  ; CHECK: %1 = load atomic i16* %ptr seq_cst, align 2
+  ; CHECK: %1 = load atomic i16, i16* %ptr seq_cst, align 2
   %1 = call i16 @llvm.nacl.atomic.load.i16(i16* %ptr, i32 6)
   ret i16 %1
 }
 
 ; CHECK-LABEL: @test_atomic_store_i16
 define void @test_atomic_store_i16(i16* %ptr, i16 zeroext %value) {
   ; CHECK: store atomic i16 %value, i16* %ptr seq_cst, align 2
   call void @llvm.nacl.atomic.store.i16(i16 %value, i16* %ptr, i32 6)
   ret void
 }
 
 ; CHECK-LABEL: @test_atomic_load_i32
 define i32 @test_atomic_load_i32(i32* %ptr) {
-  ; CHECK: %1 = load atomic i32* %ptr seq_cst, align 4
+  ; CHECK: %1 = load atomic i32, i32* %ptr seq_cst, align 4
   %1 = call i32 @llvm.nacl.atomic.load.i32(i32* %ptr, i32 6)
   ret i32 %1
 }
 
 ; CHECK-LABEL: @test_atomic_store_i32
 define void @test_atomic_store_i32(i32* %ptr, i32 %value) {
   ; CHECK: store atomic i32 %value, i32* %ptr seq_cst, align 4
   call void @llvm.nacl.atomic.store.i32(i32 %value, i32* %ptr, i32 6)
   ret void
 }
 
 ; CHECK-LABEL: @test_atomic_load_i64
 define i64 @test_atomic_load_i64(i64* %ptr) {
-  ; CHECK: %1 = load atomic i64* %ptr seq_cst, align 8
+  ; CHECK: %1 = load atomic i64, i64* %ptr seq_cst, align 8
   %1 = call i64 @llvm.nacl.atomic.load.i64(i64* %ptr, i32 6)
   ret i64 %1
 }
 
 ; CHECK-LABEL: @test_atomic_store_i64
 define void @test_atomic_store_i64(i64* %ptr, i64 %value) {
   ; CHECK: store atomic i64 %value, i64* %ptr seq_cst, align 8
   call void @llvm.nacl.atomic.store.i64(i64 %value, i64* %ptr, i32 6)
   ret void
 }
 
 ; CHECK: attributes [[RETURNS_TWICE]] = { returns_twice }