diff options
Diffstat (limited to 'lib/ReaderWriter/ELF/X86_64/ExampleSubTarget')
4 files changed, 5 insertions, 21 deletions
diff --git a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp index dbbb3ad3bc90..cb3e819aff6b 100644 --- a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp +++ b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp @@ -14,14 +14,14 @@ using namespace lld; using namespace elf; std::unique_ptr<ELFLinkingContext> -ExampleLinkingContext::create(llvm::Triple triple) { +elf::createExampleLinkingContext(llvm::Triple triple) { if (triple.getVendorName() == "example") return llvm::make_unique<ExampleLinkingContext>(triple); return nullptr; } ExampleLinkingContext::ExampleLinkingContext(llvm::Triple triple) - : X86_64LinkingContext(triple, std::unique_ptr<TargetHandlerBase>( + : X86_64LinkingContext(triple, std::unique_ptr<TargetHandler>( new ExampleTargetHandler(*this))) { _outputELFType = llvm::ELF::ET_LOPROC; } diff --git a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp index b66b0d903f6a..89ec6671f3a0 100644 --- a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp +++ b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp @@ -15,9 +15,8 @@ using namespace lld; using namespace elf; ExampleTargetHandler::ExampleTargetHandler(ExampleLinkingContext &c) - : X86_64TargetHandler(c), _exampleContext(c) {} + : X86_64TargetHandler(c), _ctx(c) {} std::unique_ptr<Writer> ExampleTargetHandler::getWriter() { - return std::unique_ptr<Writer>( - new X86_64ExecutableWriter(_exampleContext, *_x86_64TargetLayout)); + return llvm::make_unique<X86_64ExecutableWriter>(_ctx, *_targetLayout); } diff --git a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h index 19a642113359..46eade5864f9 100644 --- a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h +++ b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h @@ -23,7 +23,7 @@ public: std::unique_ptr<Writer> getWriter() override; private: - ExampleLinkingContext &_exampleContext; + ExampleLinkingContext &_ctx; }; } // end namespace elf } // end namespace lld diff --git a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/Makefile b/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/Makefile deleted file mode 100644 index 8f0b0fead1f6..000000000000 --- a/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lld/lib/ReaderWriter/ELF/X86_64/Makefile ----------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LLD_LEVEL := ../../../../.. -LIBRARYNAME := lldExampleSubTarget -USEDLIBS = lldX86_64ELFTarget.a -CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLD_LEVEL)/lib/ReaderWriter/ELF - -include $(LLD_LEVEL)/Makefile |