MC: restore behaviour of defaulting to ELF

[oota-llvm.git] / lib / MC / MCObjectFileInfo.cpp

diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index efdf677fbb82021a17774b0c120b2d06cf815705..ba132f450fbed4585a2a8e01566d0aec02199746 100644 (file)
--- 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 {