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 | 103f94747238bb67148a6d444c6e53ba8e9db794 (patch) | |
| tree | bf9853e352424d4d5219114a950a703f37302a31 /lib/MC/MCObjectFileInfo.cpp | |
| parent | b7c41fe882823c578e5adc07c5653d7f80431f70 (diff) | |
| download | llvm-103f94747238bb67148a6d444c6e53ba8e9db794.tar.gz llvm-103f94747238bb67148a6d444c6e53ba8e9db794.tar.bz2 llvm-103f94747238bb67148a6d444c6e53ba8e9db794.tar.xz | |
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
Diffstat (limited to 'lib/MC/MCObjectFileInfo.cpp')
| -rw-r--r-- | lib/MC/MCObjectFileInfo.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index efdf677fbb..ba132f450f 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 { |