SPIRV: Simplify createObjectTargetWriter

Author: MaskRay

llvm/include/llvm/MC/MCSPIRVObjectWriter.h

@@ -18,9 +18,6 @@
 namespace llvm {
 
 class MCSPIRVObjectTargetWriter : public MCObjectTargetWriter {
-protected:
-  explicit MCSPIRVObjectTargetWriter() {}
-
 public:
   Triple::ObjectFormatType getFormat() const override { return Triple::SPIRV; }
   static bool classof(const MCObjectTargetWriter *W) {

llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt

@@ -5,7 +5,6 @@ add_llvm_component_library(LLVMSPIRVDesc
   SPIRVTargetStreamer.cpp
   SPIRVAsmBackend.cpp
   SPIRVMCCodeEmitter.cpp
-  SPIRVObjectTargetWriter.cpp
   SPIRVInstPrinter.cpp
 
   LINK_COMPONENTS

llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVAsmBackend.cpp

@@ -10,6 +10,7 @@
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCSPIRVObjectWriter.h"
 #include "llvm/Support/EndianStream.h"
 
 using namespace llvm;
@@ -26,18 +27,9 @@ class SPIRVAsmBackend : public MCAsmBackend {
 
   std::unique_ptr<MCObjectTargetWriter>
   createObjectTargetWriter() const override {
-    return createSPIRVObjectTargetWriter();
+    return std::make_unique<MCSPIRVObjectTargetWriter>();
   }
 
-
-  bool mayNeedRelaxation(const MCInst &Inst,
-                         const MCSubtargetInfo &STI) const override {
-    return false;
-  }
-
-  void relaxInstruction(MCInst &Inst,
-                        const MCSubtargetInfo &STI) const override {}
-
   bool writeNopData(raw_ostream &OS, uint64_t Count,
                     const MCSubtargetInfo *STI) const override {
     return false;

llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVMCTargetDesc.h

@@ -34,8 +34,6 @@ MCCodeEmitter *createSPIRVMCCodeEmitter(const MCInstrInfo &MCII,
 MCAsmBackend *createSPIRVAsmBackend(const Target &T, const MCSubtargetInfo &STI,
                                     const MCRegisterInfo &MRI,
                                     const MCTargetOptions &Options);
-
-std::unique_ptr<MCObjectTargetWriter> createSPIRVObjectTargetWriter();
 } // namespace llvm
 
 // Defines symbolic names for SPIR-V registers.  This defines a mapping from