diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-04-27 04:54:16 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-04-27 04:54:16 +0000 |
| commit | ffdb92a70c5a2287ebeeecbaf6f501e6cf0c5bf4 (patch) | |
| tree | 82aa6129e290d2d84a4b13beee85b04a0b4b839a /llvm/lib/MC | |
| parent | d08e5b965550e6f20b2279d24ca3d42002a0c4e0 (diff) | |
| download | bcm5719-llvm-ffdb92a70c5a2287ebeeecbaf6f501e6cf0c5bf4.tar.gz bcm5719-llvm-ffdb92a70c5a2287ebeeecbaf6f501e6cf0c5bf4.zip | |
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.
llvm-svn: 207349
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index efdf677fbb8..ba132f450fb 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/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 { |
