diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-03-06 23:02:15 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-03-06 23:02:15 +0000 |
| commit | 5715e522acc6d9132e6f2f6280bd80587ea0a255 (patch) | |
| tree | 4c71cc4a8557db28adafcb9622f41f1a4a4ae0a6 /llvm/lib/MC/MCObjectFileInfo.cpp | |
| parent | 328a7c4b8ba0ba6b9dc6deb2074249f13ad3f5b3 (diff) | |
| download | llvm-5715e522acc6d9132e6f2f6280bd80587ea0a255.zip llvm-5715e522acc6d9132e6f2f6280bd80587ea0a255.tar.gz llvm-5715e522acc6d9132e6f2f6280bd80587ea0a255.tar.bz2 | |
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.
llvm-svn: 203176
Diffstat (limited to 'llvm/lib/MC/MCObjectFileInfo.cpp')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index 6b21cd3..4211b17 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -739,9 +739,8 @@ void MCObjectFileInfo::InitMCObjectFileInfo(StringRef TT, Reloc::Model relocm, (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 { |