Changes from 3.7 merge to files not in upstream

test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll

Index: test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll
diff --git a/test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll b/test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll
index 1d88ca5cd96c88ccda3ff23ad6e68643e5d8d4c4..3a440c0b2368af86e2eb7b8dbd2dd0bd7c8feecd 100644
--- a/test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll
+++ b/test/NaCl/Bitcode/inttoptr-of-ptrtoint-elide.ll
@@ -15,13 +15,13 @@ define void @inttoptr_of_ptrtoint() {
   ; bitcast, but either sequence is allowed by the PNaCl ABI verifier.
   %1 = ptrtoint [4 x i8]* @bytes to i32
   %2 = inttoptr i32 %1 to i8*
-  load i8* %2
+  load i8, i8* %2
   ret void
 }
 
 ; TD2:      define void @inttoptr_of_ptrtoint() {
 ; TD2-NEXT:   %1 = bitcast [4 x i8]* @bytes to i8*
-; TD2-NEXT:   %2 = load i8* %1
+; TD2-NEXT:   %2 = load i8, i8* %1
 ; TD2-NEXT:   ret void
 ; TD2-NEXT: }