From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 6 Mar 2014 20:47:03 +0000 (+0000)
Subject: MC: simplify object file selection for Windows
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5219b0f586e901b0aee7c927d97cf6d43f8fc49d;p=oota-llvm.git

MC: simplify object file selection for Windows

Windows always uses COFF unless Windows ELF is in use.  Rather than checking if
Windows, MinGW, or Cygwin is being targeted, just check if the target OS is
windows and that it is not an ELF environment.

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

diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index 931b3544e34..9a512d561fe 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -739,10 +739,9 @@ void MCObjectFileInfo::InitMCObjectFileInfo(StringRef TT, Reloc::Model relocm,
       (T.isOSDarwin() || T.getEnvironment() == Triple::MachO)) {
     Env = IsMachO;
     InitMachOMCObjectFileInfo(T);
-  } else if ((Arch == Triple::x86 || Arch == Triple::x86_64) &&
-             (T.getEnvironment() != Triple::ELF) &&
-             (T.getOS() == Triple::MinGW32 || T.getOS() == Triple::Cygwin ||
-              T.getOS() == Triple::Win32)) {
+  } else if (T.isOSWindows() && T.getEnvironment() != Triple::ELF) {
+    assert((Arch == Triple::x86 || Arch == Triple::x86_64) &&
+           "expected x86 or x86_64");
     Env = IsCOFF;
     InitCOFFMCObjectFileInfo(T);
   } else {