Changes from 3.7 merge to files not in upstream

test/NaCl/ARM/call-return-sandboxing1.ll

Index: test/NaCl/ARM/call-return-sandboxing1.ll
diff --git a/test/NaCl/ARM/call-return-sandboxing1.ll b/test/NaCl/ARM/call-return-sandboxing1.ll
index b6b90e2a0cab9c38c1c961bd93411b7874d89096..a26d965d292803f036f855585f19f6ce99a74803 100644
--- a/test/NaCl/ARM/call-return-sandboxing1.ll
+++ b/test/NaCl/ARM/call-return-sandboxing1.ll
@@ -9,20 +9,20 @@ entry:
   %dd = alloca i32, align 4
   store i32 %aa, i32* %aa.addr, align 4
   store i32 %bb, i32* %bb.addr, align 4
-  %0 = load i32* %aa.addr, align 4
-  %1 = load i32* %bb.addr, align 4
+  %0 = load i32, i32* %aa.addr, align 4
+  %1 = load i32, i32* %bb.addr, align 4
   %mul = mul nsw i32 %0, %1
   store i32 %mul, i32* %cc, align 4
   %sub = sub nsw i32 %mul, %1
   store i32 %sub, i32* %dd, align 4
-  %2 = load i32* %dd, align 4
+  %2 = load i32, i32* %dd, align 4
   ret i32 %2
 
 ; This checks two things:
 ; 1. bx lr is sandboxed by prepending a bic
 ; 2. The bic/bx pair don't straddle a 16-byte bundle boundary, hence the nop
 ; CHECK:                    nop
-; CHECK-NEXT: {{.*}}0:{{.*}}bic lr, lr, #3221225487
+; CHECK-NEXT: {{.*}}0:{{.*}}bic lr, lr, #-1073741809
 ; CHECK-NEXT:               bx lr
 
 }
@@ -40,7 +40,7 @@ entry:
   %bb.addr = alloca i32, align 4
   store i32 %aa, i32* %aa.addr, align 4
   store i32 %bb, i32* %bb.addr, align 4
-  %0 = load i32* %aa.addr, align 4
+  %0 = load i32, i32* %aa.addr, align 4
   %mul = mul nsw i32 %0, 19
   %call = call i32 @foo(i32 %mul, i32 7)
 
@@ -48,9 +48,9 @@ entry:
 ; CHECK:      {{.*}}8:{{.*}}nop
 ; CHECK-NEXT: {{.*}}c:{{.*}}bl
 
-  %1 = load i32* %bb.addr, align 4
+  %1 = load i32, i32* %bb.addr, align 4
   %mul1 = mul nsw i32 %1, 31
-  %2 = load i32* %bb.addr, align 4
+  %2 = load i32, i32* %bb.addr, align 4
   %div = sdiv i32 %2, 7
   %add = add nsw i32 %div, 191
   %call2 = call i32 @foo(i32 %mul1, i32 %add)