From 4acde1d4dc401976e264cb1ae159a6824d074938 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 8 Jun 2014 19:08:36 +0000 Subject: [PATCH] X86: simplify data layout calculation X86Subtarget::isTargetCygMing || X86Subtarget::isTargetKnownWindowsMSVC is equivalent to all Windows environments. Simplify the check to isOSWindows. NFC. llvm-svn: 210431 --- llvm/lib/Target/X86/X86TargetMachine.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 59b8cba..f011619 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/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"; -- 2.7.4