[llvm] r370147 - Revert r370105 - Update two x86 datalayouts for r370083, looks like racing commits

[Richard Trieu via llvm-commits]

Author: rtrieu
Date: Tue Aug 27 18:55:06 2019
New Revision: 370147

URL: http://llvm.org/viewvc/llvm-project?rev=370147&view=rev
Log:
Revert r370105 - Update two x86 datalayouts for r370083, looks like racing commits

r370083 has been reverted, which this change depends on.

Modified:
    llvm/trunk/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
    llvm/trunk/test/ThinLTO/X86/printer.ll

Modified: llvm/trunk/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll?rev=370147&r1=370146&r2=370147&view=diff
==============================================================================
--- llvm/trunk/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll (original)
+++ llvm/trunk/test/LTO/Resolution/X86/not-prevailing-weak-aliasee.ll Tue Aug 27 18:55:06 2019
@@ -15,7 +15,7 @@
 ; CHECK: declare hidden void @__b
 ; CHECK: declare void @b
 
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @a = hidden alias void (), void ()* @__a

Modified: llvm/trunk/test/ThinLTO/X86/printer.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/printer.ll?rev=370147&r1=370146&r2=370147&view=diff
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/printer.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/printer.ll Tue Aug 27 18:55:06 2019
@@ -4,7 +4,7 @@
 ; CHECK-BEFORE: *** IR Dump Before GlobalDCEPass ***
 ; CHECK-AFTER: *** IR Dump After GlobalDCEPass ***
 
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define i32 @foo() {