Changes from 3.7 merge to files not in upstream

test/NaCl/ARM/sp-arithmetic-sandboxing1.ll

Index: test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
diff --git a/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll b/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
index d471612d9c0d0b49c47d5994d0113cecfc376d87..92b890cf3bbeae020142fa87a3fd62d6e4cf263a 100644
--- a/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
+++ b/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
@@ -8,21 +8,21 @@ entry:
   %temp = alloca i32, align 4
 
 ; CHECK:        sub   sp, sp
-; CHECK-NEXT:   bic   sp, sp, #3221225472
+; CHECK-NEXT:   bic   sp, sp, #-1073741824
 
   store i32* %input, i32** %input.addr, align 4
   store i32* %output, i32** %output.addr, align 4
-  %0 = load i32** %input.addr, align 4
-  %arrayidx = getelementptr inbounds i32* %0, i32 1
-  %1 = load i32* %arrayidx, align 4
+  %0 = load i32*, i32** %input.addr, align 4
+  %arrayidx = getelementptr inbounds i32, i32* %0, i32 1
+  %1 = load i32, i32* %arrayidx, align 4
   store i32 %1, i32* %temp, align 4
-  %2 = load i32* %temp, align 4
-  %3 = load i32** %output.addr, align 4
-  %arrayidx1 = getelementptr inbounds i32* %3, i32 0
+  %2 = load i32, i32* %temp, align 4
+  %3 = load i32*, i32** %output.addr, align 4
+  %arrayidx1 = getelementptr inbounds i32, i32* %3, i32 0
   store i32 %2, i32* %arrayidx1, align 4
 
 ; CHECK:        add   sp, sp
-; CHECK-NEXT:   bic   sp, sp, #3221225472
+; CHECK-NEXT:   bic   sp, sp, #-1073741824
 
   ret void
 }