Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/expand-tls-constexpr-alias.ll

Index: test/Transforms/NaCl/expand-tls-constexpr-alias.ll
diff --git a/test/Transforms/NaCl/expand-tls-constexpr-alias.ll b/test/Transforms/NaCl/expand-tls-constexpr-alias.ll
index 65daa5eacd4ab3ce6e3fe6e3125761dc6dd3a043..2b3d7546d877d85571e2f2b82a8ca6fd0c030eb9 100644
--- a/test/Transforms/NaCl/expand-tls-constexpr-alias.ll
+++ b/test/Transforms/NaCl/expand-tls-constexpr-alias.ll
@@ -2,7 +2,7 @@
 
 @real_tvar = thread_local global i32 123
 @tvar_alias = alias i32* @real_tvar
-@tvar_alias2 = alias i32* getelementptr (i32* @real_tvar, i32 100)
+@tvar_alias2 = alias i32* getelementptr (i32, i32* @real_tvar, i32 100)
 
 
 define i32* @get_tvar() {
@@ -16,13 +16,13 @@ define i32* @get_tvar2() {
   ret i32* @tvar_alias2
 }
 ; CHECK: define i32* @get_tvar2()
-; CHECK: %expanded = getelementptr i32* @real_tvar, i32 100
+; CHECK: %expanded = getelementptr i32, i32* @real_tvar, i32 100
 ; CHECK: ret i32* %expanded
 
 
 define i32* @get_tvar3() {
-  ret i32* getelementptr (i32* @tvar_alias2, i32 100)
+  ret i32* getelementptr (i32, i32* @tvar_alias2, i32 100)
 }
 ; CHECK: define i32* @get_tvar3()
-; CHECK: %expanded = getelementptr i32* @real_tvar, i32 200
+; CHECK: %expanded = getelementptr i32, i32* @real_tvar, i32 200
 ; CHECK: ret i32* %expanded