aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCObjectFileInfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/MC/MCObjectFileInfo.cpp')
-rw-r--r--llvm/lib/MC/MCObjectFileInfo.cpp5
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 {