From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Sun, 8 Jun 2014 19:08:36 +0000 (+0000)
Subject: X86: simplify data layout calculation
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa53e497791ac984834996332789a14bf262070f;p=oota-llvm.git

X86: simplify data layout calculation

X86Subtarget::isTargetCygMing || X86Subtarget::isTargetKnownWindowsMSVC is
equivalent to all Windows environments.  Simplify the check to isOSWindows.
NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210431 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 59b8cba3139..f011619f392 100644
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -39,8 +39,7 @@ static std::string computeDataLayout(const X86Subtarget &ST) {
     Ret += "-p:32:32";
 
   // Some ABIs align 64 bit integers and doubles to 64 bits, others to 32.
-  if (ST.is64Bit() || ST.isTargetCygMing() || ST.isTargetKnownWindowsMSVC() ||
-      ST.isTargetNaCl())
+  if (ST.is64Bit() || ST.isOSWindows() || ST.isTargetNaCl())
     Ret += "-i64:64";
   else
     Ret += "-f64:32:64";
@@ -60,7 +59,7 @@ static std::string computeDataLayout(const X86Subtarget &ST) {
     Ret += "-n8:16:32";
 
   // The stack is aligned to 32 bits on some ABIs and 128 bits on others.
-  if (!ST.is64Bit() && (ST.isTargetCygMing() || ST.isTargetKnownWindowsMSVC()))
+  if (!ST.is64Bit() && ST.isOSWindows())
     Ret += "-S32";
   else
     Ret += "-S128";