[llvm] r203176 - Reapply "MC: simplify object file selection for Windows"

[Saleem Abdulrasool]

Author: compnerd
Date: Thu Mar  6 17:02:15 2014
New Revision: 203176

URL: http://llvm.org/viewvc/llvm-project?rev=203176&view=rev
Log:
Reapply "MC: simplify object file selection for Windows"

That was overly aggressive in assuming that we could always assume COFF.  Some
of the tests assume that they will get ELF rather than COFF even on Windows
where the default is COFF.

Modified:
    llvm/trunk/lib/MC/MCObjectFileInfo.cpp

Modified: llvm/trunk/lib/MC/MCObjectFileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=203176&r1=203175&r2=203176&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCObjectFileInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCObjectFileInfo.cpp Thu Mar  6 17:02:15 2014
@@ -739,9 +739,8 @@ void MCObjectFileInfo::InitMCObjectFileI
       (T.isOSDarwin() || T.isOSBinFormatMachO())) {
     Env = IsMachO;
     InitMachOMCObjectFileInfo(T);
-  } else if (T.isOSWindows() && !T.isOSBinFormatELF()) {
-    assert((Arch == Triple::x86 || Arch == Triple::x86_64) &&
-           "expected x86 or x86_64");
+  } else if ((Arch == Triple::x86 || Arch == Triple::x86_64) &&
+             T.getObjectFormat() != Triple::ELF && T.isOSWindows()) {
     Env = IsCOFF;
     InitCOFFMCObjectFileInfo(T);
   } else {