diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackendWinCOFF.h b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackendWinCOFF.h --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackendWinCOFF.h +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackendWinCOFF.h @@ -20,7 +20,7 @@ : ARMAsmBackend(T, STI, support::little) {} std::unique_ptr createObjectTargetWriter() const override { - return createARMWinCOFFObjectWriter(/*Is64Bit=*/false); + return createARMWinCOFFObjectWriter(); } }; } diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h @@ -106,7 +106,7 @@ /// Construct an ARM PE/COFF object writer. std::unique_ptr -createARMWinCOFFObjectWriter(bool Is64Bit); +createARMWinCOFFObjectWriter(); /// Construct ARM Mach-O relocation info. MCRelocationInfo *createARMMachORelocationInfo(MCContext &Ctx); diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp @@ -26,9 +26,8 @@ class ARMWinCOFFObjectWriter : public MCWinCOFFObjectTargetWriter { public: - ARMWinCOFFObjectWriter(bool Is64Bit) + ARMWinCOFFObjectWriter() : MCWinCOFFObjectTargetWriter(COFF::IMAGE_FILE_MACHINE_ARMNT) { - assert(!Is64Bit && "AArch64 support not yet implemented"); } ~ARMWinCOFFObjectWriter() override = default; @@ -47,9 +46,6 @@ const MCFixup &Fixup, bool IsCrossSection, const MCAsmBackend &MAB) const { - assert(getMachine() == COFF::IMAGE_FILE_MACHINE_ARMNT && - "AArch64 support not yet implemented"); - MCSymbolRefExpr::VariantKind Modifier = Target.isAbsolute() ? MCSymbolRefExpr::VK_None : Target.getSymA()->getKind(); @@ -91,8 +87,8 @@ namespace llvm { std::unique_ptr -createARMWinCOFFObjectWriter(bool Is64Bit) { - return std::make_unique(Is64Bit); +createARMWinCOFFObjectWriter() { + return std::make_unique(); } } // end namespace llvm