Reland "Change the X86 datalayout to add three address spaces

 for 32 bit signed, 32 bit unsigned, and 64 bit pointers."
This reverts 57076d3199fc2b0af4a3736b7749dd5462cacda5.

Original review at https://reviews.llvm.org/D64931.
Review for added fix at https://reviews.llvm.org/D66843.

llvm-svn: 371568

70 files changed, 70 insertions, 70 deletions

diff --git a/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll b/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll
index e55e40b1d05..88bc8335f5e 100644
--- a/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define internal i32 @f(i8*) unnamed_addr {
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll b/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll
index 43608d5bf89..489db0627d8 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @f() !type !0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll
index 58bfb39f9ee..f0ebfe29da0 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @f1() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll
index 899bbaea13d..258a20be169 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @f2() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll
index 95ecd182435..2cf9a2d8643 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define i1 @importf1(i8* %p) {
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll
index e53673bcd05..679b6b3c682 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @vt1 = constant i32 0, !type !0
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll
index 283badad3bb..067804293b5 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @vt2 = constant i1 (i8*)* @vf2, !type !0
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll
index 830622e9cd7..c3de5205ede 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @vt2a = constant i1 (i8*)* @vf2a, !type !0
diff --git a/llvm/test/ThinLTO/X86/Inputs/cache.ll b/llvm/test/ThinLTO/X86/Inputs/cache.ll
index aab44cb80c7..62ddd68ef6a 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cache.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cache.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll b/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll
index 1e77b08863a..7718347e324 100644
--- a/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @fptr = internal unnamed_addr global i32 (i32)* @f2, align 8
diff --git a/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll b/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll
index cc1c4fd7875..18554a009fc 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-grtev4-linux-gnu"
 
 %struct.B2 = type { %struct.A2 }
diff --git a/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll b/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll
index 06fb015b222..94186ae1621 100644
--- a/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 declare !type !0 i8 @bar(i8*)
diff --git a/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll b/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll
index 4880cd98d81..70d3edd7efe 100644
--- a/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'test/ThinLTO/X86/Inputs/crash_debuginfo.ll'
 source_filename = "src.bc"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.7.0"
 
 define void @bar(i32 %arg) {
diff --git a/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll b/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll
index 057305ae67e..34211802a77 100644
--- a/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 declare void @dead_func()
diff --git a/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll b/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll
index 7e80c4d7c44..5b1e16b479d 100644
--- a/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'debuginfo-compositetype-import2.c'
 source_filename = "debuginfo-compositetype-import2.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Function Attrs: nounwind uwtable
diff --git a/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll b/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll
index 6b824e94073..24370724908 100644
--- a/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'debuginfo-cu-import2.c'
 source_filename = "debuginfo-cu-import2.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Function Attrs: nounwind uwtable
diff --git a/llvm/test/ThinLTO/X86/Inputs/devirt2.ll b/llvm/test/ThinLTO/X86/Inputs/devirt2.ll
index 659c0afccde..a67e803161d 100644
--- a/llvm/test/ThinLTO/X86/Inputs/devirt2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/devirt2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-grtev4-linux-gnu"
 
 %struct.A = type { i32 (...)** }
diff --git a/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll b/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll
index 35154e67947..c6ef6d1c78e 100644
--- a/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll
index 8fa97d4f0ad..ee1c272d397 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-scei-ps4"
 
 %struct.CFVS = type { %struct.Vec }
diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll
index e27a7b1623f..8d31eae6e81 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll
index 507fa13c623..1d2f584975e 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-scei-ps4"
 
 %struct.CFVS = type { %struct.Vec }
diff --git a/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll b/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll
index d149de2a96f..4e745a459fa 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @A = local_unnamed_addr global i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll b/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll
index 6d9783e92d0..854c1e4a2de 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @A = local_unnamed_addr global i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll b/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll
index cf3b295153a..ad9c48597b9 100644
--- a/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll
@@ -1,7 +1,7 @@
 ; This file is checked-in as a .bc file, because the debug info version is
 ; intentionally out-of-date and llvm-as will drop it before writing the bitcode
 
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll b/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll
index 5e08d9812db..1dfb7c5b962 100644
--- a/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc19.11.0"
 define dso_local dllexport i32 @foo() {
   ret i32 42
diff --git a/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll b/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll
index 31c72ec4653..7cf01bc86c3 100644
--- a/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @g() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll b/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll
index 2136ec3471d..8776860d739 100644
--- a/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @h() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/empty.ll b/llvm/test/ThinLTO/X86/Inputs/empty.ll
index a3c99cdfe77..a4e3140422e 100644
--- a/llvm/test/ThinLTO/X86/Inputs/empty.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/empty.ll
@@ -1,2 +1,2 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll b/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll
index 1c55e078ea3..276cf61d042 100644
--- a/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/export.ll b/llvm/test/ThinLTO/X86/Inputs/export.ll
index cab8591fd9f..d99a76c3fce 100644
--- a/llvm/test/ThinLTO/X86/Inputs/export.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/export.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 define i32 @main() #0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll
index b204afe3d4d..022d10641eb 100644
--- a/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll
index 72aea1e5e25..4ecfa7886b5 100644
--- a/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport.ll
index e0df9e0e7c0..1a79dbe14dc 100644
--- a/llvm/test/ThinLTO/X86/Inputs/funcimport.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/funcimport.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll
index 216ef0f1daa..dcebd184883 100644
--- a/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll b/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll
index ea2c2eda8d5..87418dd30e8 100644
--- a/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll
@@ -1,5 +1,5 @@
 target triple = "x86_64-unknown-linux-gnu"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 
 declare void @h();
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll
index fe1fa70ee83..3349549f66f 100644
--- a/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @label_addr = internal constant [1 x i8*] [i8* blockaddress(@foo, %lb)], align 8
diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll
index e41163063b4..5a3e5001f6d 100644
--- a/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 @baz = local_unnamed_addr constant i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import.ll
index b229f4a4bde..ec4ff6eb338 100644
--- a/llvm/test/ThinLTO/X86/Inputs/globals-import.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/globals-import.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 @baz = internal constant i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll b/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll
index fe2b2934724..5c452d58e8c 100644
--- a/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 %0 = type { i8 }
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll
index d5aa6ee0b61..8d76b450c8a 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @g = global i32 42, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll
index 5f85f1e38c9..a306b5a3491 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @gFoo = internal unnamed_addr global i32 1, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll
index 6bcf3b32d0d..a7a21f9337d 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Function Attrs: nounwind ssp uwtable
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll
index 75a8f071f48..05a168fc8f0 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Function Attrs: nounwind ssp uwtable
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll
index 819ba8caa32..44c9b3e26f3 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 $comdat.any = comdat any
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll
index 555f76f5930..68947b4c3b1 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @g = global i32 42, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll
index e22f9198951..df57a897b72 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @g = external global i32
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll
index ec0de9c9141..53020763dff 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @b = global i32* @a, align 8
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll
index 24c724743e0..7f74ca67113 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @g1 = common global i32 0, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll
index eda62fb4e5b..90e1763349c 100644
--- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 @gBar = local_unnamed_addr global i32 2, align 4, !dbg !0
diff --git a/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll b/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll
index f51a08a1a3f..5ad8652b5d2 100644
--- a/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 declare void @globalfunc1()
diff --git a/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll
index 66847f50b15..f832f843d45 100644
--- a/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-grtev4-linux-gnu"
 
 define i32 @main() #0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll
index 6ec8d0048fd..e0bb06859e7 100644
--- a/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-grtev4-linux-gnu"
 
 @linkonceodrunnamed = linkonce_odr unnamed_addr constant i32 0
diff --git a/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll
index 59434a81986..92b51823159 100644
--- a/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 $c2 = comdat any
diff --git a/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll b/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll
index 35f5529c2b6..8f13709524b 100644
--- a/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 
diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll
index d7b7ea61883..de43b7825b9 100644
--- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'local_name_conflict.o'
 source_filename = "local_name_conflict.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @baz = internal constant i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll
index 40a4e866599..7e2412af20f 100644
--- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'local_name_conflict.o'
 source_filename = "local_name_conflict.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @baz = internal constant i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll
index fb5306fc337..bec5f67f594 100644
--- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'local_name_conflict_var.o'
 source_filename = "local_name_conflict_var.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @baz = internal global i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll
index bf3c262f180..51cd0bef095 100644
--- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'local_name_conflict_var.o'
 source_filename = "local_name_conflict_var.c"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @baz = internal global i32 10, align 4
diff --git a/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll b/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll
index 6ee881573ce..3be4b8f4442 100644
--- a/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll
@@ -1,2 +1,2 @@
 target triple = "x86_64-apple-macosx10.11.0"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/ThinLTO/X86/Inputs/module_asm.ll b/llvm/test/ThinLTO/X86/Inputs/module_asm.ll
index 337e8613c6e..f713310eaef 100644
--- a/llvm/test/ThinLTO/X86/Inputs/module_asm.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/module_asm.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define i32 @main({ i64, { i64, i8* }* } %unnamed) #0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll b/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll
index a8081cccaf3..f5ff45178d1 100644
--- a/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define i32 @main({ i64, { i64, i8* }* } %unnamed) #0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/noinline.ll b/llvm/test/ThinLTO/X86/Inputs/noinline.ll
index 73db2912cab..f412b332c1c 100644
--- a/llvm/test/ThinLTO/X86/Inputs/noinline.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/noinline.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 define i32 @foo(i32) local_unnamed_addr #0 {
diff --git a/llvm/test/ThinLTO/X86/Inputs/personality-local.ll b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll
index dc27a375e1a..c610a69746e 100644
--- a/llvm/test/ThinLTO/X86/Inputs/personality-local.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 define void @foo() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/personality.ll b/llvm/test/ThinLTO/X86/Inputs/personality.ll
index 37046b5c28d..c97b5038639 100644
--- a/llvm/test/ThinLTO/X86/Inputs/personality.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/personality.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-linux-gnu"
 
 define void @bar() personality i32 (i32, i32, i64, i8*, i8*)* @personality_routine {
diff --git a/llvm/test/ThinLTO/X86/Inputs/pr35472.ll b/llvm/test/ThinLTO/X86/Inputs/pr35472.ll
index b9c92b3e3fb..c330193d737 100644
--- a/llvm/test/ThinLTO/X86/Inputs/pr35472.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/pr35472.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'b.cpp'
 source_filename = "b.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; Function Attrs: noinline optnone uwtable
diff --git a/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll b/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll
index dab18539ec6..66289663a0d 100644
--- a/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 declare i8 **@foo()
diff --git a/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll b/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll
index f5e7bc9d89a..205308ba234 100644
--- a/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll
@@ -1,5 +1,5 @@
 
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 define void @referencedbyglobal() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll b/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll
index 5473f817f13..f2d74a03737 100644
--- a/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 $__llvm_profile_filename = comdat any
diff --git a/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll b/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll
index 225685d931b..de41676271c 100644
--- a/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.15.0"
 
 define i32 @main() {
diff --git a/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll b/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll
index fe9edc66d49..9ef7cbb0986 100644
--- a/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll
+++ b/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll
@@ -1,4 +1,4 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 ; Alias are not optimized