Changes from 3.7 merge to files not in upstream

test/NaCl/ARM/neon-vst4-sandboxing.ll

Index: test/NaCl/ARM/neon-vst4-sandboxing.ll
diff --git a/test/NaCl/ARM/neon-vst4-sandboxing.ll b/test/NaCl/ARM/neon-vst4-sandboxing.ll
index ba7f2a47e25a2746c72bdd3a285f0fe470f26d89..fdbd61927912b931d9cb388d6e424dea937183d5 100644
--- a/test/NaCl/ARM/neon-vst4-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vst4-sandboxing.ll
@@ -2,42 +2,42 @@
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst4i8(i8* %A, <8 x i8>* %B) nounwind {
-  %tmp1 = load <8 x i8>* %B
+  %tmp1 = load <8 x i8>, <8 x i8>* %B
   call void @llvm.arm.neon.vst4.v8i8(i8* %A, <8 x i8> %tmp1, <8 x i8> %tmp1, <8 x i8> %tmp1, <8 x i8> %tmp1, i32 8)
-; CHECK:         bic r0, r0, #3221225472
-; CHECK-NEXT:    vst4.8 {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:64]
+; CHECK:         bic r0, r0, #-1073741824
+; CHECK-NEXT:    vst4.{{[0-9]+}} {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:64]
   ret void
 }
 
 define void @vst4i16(i16* %A, <4 x i16>* %B) nounwind {
   %tmp0 = bitcast i16* %A to i8*
-  %tmp1 = load <4 x i16>* %B
+  %tmp1 = load <4 x i16>, <4 x i16>* %B
   call void @llvm.arm.neon.vst4.v4i16(i8* %tmp0, <4 x i16> %tmp1, <4 x i16> %tmp1, <4 x i16> %tmp1, <4 x i16> %tmp1, i32 16)
-; CHECK:         bic r0, r0, #3221225472
-; CHECK-NEXT:    vst4.16 {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:128]
+; CHECK:         bic r0, r0, #-1073741824
+; CHECK-NEXT:    vst4.{{[0-9]+}} {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:128]
   ret void
 }
 
 define void @vst4i32(i32* %A, <2 x i32>* %B) nounwind {
   %tmp0 = bitcast i32* %A to i8*
-  %tmp1 = load <2 x i32>* %B
+  %tmp1 = load <2 x i32>, <2 x i32>* %B
   call void @llvm.arm.neon.vst4.v2i32(i8* %tmp0, <2 x i32> %tmp1, <2 x i32> %tmp1, <2 x i32> %tmp1, <2 x i32> %tmp1, i32 32)
-; CHECK:         bic r0, r0, #3221225472
-; CHECK-NEXT:    vst4.32 {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:256]
+; CHECK:         bic r0, r0, #-1073741824
+; CHECK-NEXT:    vst4.{{[0-9]+}} {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r0:256]
   ret void
 }
 
 ;Check for a post-increment updating store.
 define void @vst4Qf_update(float** %ptr, <4 x float>* %B) nounwind {
-  %A = load float** %ptr
+  %A = load float*, float** %ptr
   %tmp0 = bitcast float* %A to i8*
-  %tmp1 = load <4 x float>* %B
-; CHECK:         bic r1, r1, #3221225472
-; CHECK-NEXT:    vld1.32 {d{{[0-9]+}}, d{{[0-9]+}}}, [r1]
+  %tmp1 = load <4 x float>, <4 x float>* %B
+; CHECK:         bic r1, r1, #-1073741824
+; CHECK-NEXT:    vld1.{{[0-9]+}} {d{{[0-9]+}}, d{{[0-9]+}}}, [r1]
   call void @llvm.arm.neon.vst4.v4f32(i8* %tmp0, <4 x float> %tmp1, <4 x float> %tmp1, <4 x float> %tmp1, <4 x float> %tmp1, i32 1)
-; CHECK:         bic r1, r1, #3221225472
-; CHECK-NEXT:    vst4.32 {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r1]!
-  %tmp2 = getelementptr float* %A, i32 16
+; CHECK:         bic r1, r1, #-1073741824
+; CHECK-NEXT:    vst4.{{[0-9]+}} {d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}, d{{[0-9]+}}}, [r1]!
+  %tmp2 = getelementptr float, float* %A, i32 16
   store float* %tmp2, float** %ptr
   ret void
 }