Changes from 3.7 merge to files not in upstream

test/NaCl/X86/nacl-read-tp-intrinsic.ll

Index: test/NaCl/X86/nacl-read-tp-intrinsic.ll
diff --git a/test/NaCl/X86/nacl-read-tp-intrinsic.ll b/test/NaCl/X86/nacl-read-tp-intrinsic.ll
index f72d553d589b175d3a9d71ef4272690a98703ec9..501bf8b9bcb81bb14b9cd6ed2b268e765ae29bb7 100644
--- a/test/NaCl/X86/nacl-read-tp-intrinsic.ll
+++ b/test/NaCl/X86/nacl-read-tp-intrinsic.ll
@@ -34,7 +34,7 @@ define i8* @get_thread_pointer() {
 ; and generate the code above.
 define i8* @get_thread_pointer_add() {
   %tp = call i8* @llvm.nacl.read.tp()
-  %result = getelementptr i8* %tp, i32 1000
+  %result = getelementptr i8, i8* %tp, i32 1000
   ret i8* %result
 }