From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Sun, 27 Apr 2014 04:54:16 +0000 (+0000)
Subject: MC: restore behaviour of defaulting to ELF
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=103f94747238bb67148a6d444c6e53ba8e9db794;p=oota-llvm.git

MC: restore behaviour of defaulting to ELF

This restores the previous behaviour of just assuming that if you dont specify a
valid triple that you really meant the default triple with an ELF object file.

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

diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index efdf677fbb8..ba132f450fb 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -780,10 +780,9 @@ void MCObjectFileInfo::InitMCObjectFileInfo(StringRef TT, Reloc::Model relocm,
       (T.isOSDarwin() || T.isOSBinFormatMachO())) {
     Env = IsMachO;
     InitMachOMCObjectFileInfo(T);
-  } else if (T.isOSWindows() && T.getObjectFormat() == Triple::COFF) {
-    assert((Arch == Triple::x86 || Arch == Triple::x86_64 ||
-            Arch == Triple::arm || Arch == Triple::thumb) &&
-           "unsupported Windows COFF architecture");
+  } else if ((Arch == Triple::x86 || Arch == Triple::x86_64 ||
+              Arch == Triple::arm || Arch == Triple::thumb) &&
+             (T.isOSWindows() && T.getObjectFormat() == Triple::COFF)) {
     Env = IsCOFF;
     InitCOFFMCObjectFileInfo(T);
   } else {