diff options
6 files changed, 12 insertions, 30 deletions
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h index e917d952ece..e19fc6be1d3 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h @@ -20,9 +20,6 @@ namespace elf { class AArch64LinkingContext; class AArch64TargetHandler final : public TargetHandler { - typedef ELFReader<ELFFile<ELF64LE>> ObjReader; - typedef ELFReader<DynamicFile<ELF64LE>> DSOReader; - public: AArch64TargetHandler(AArch64LinkingContext &ctx); @@ -31,11 +28,11 @@ public: } std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<ELFFile<ELF64LE>>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<DSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELF64LE>>>(_ctx); } std::unique_ptr<Writer> getWriter() override; diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h index b460e9338d9..4a2d7165eaa 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h @@ -59,9 +59,6 @@ private: }; class ARMTargetHandler final : public TargetHandler { - typedef ELFReader<ARMELFFile> ObjReader; - typedef ELFReader<DynamicFile<ELF32LE>> DSOReader; - public: ARMTargetHandler(ARMLinkingContext &ctx); @@ -70,11 +67,11 @@ public: } std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<ARMELFFile>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<DSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELF32LE>>>(_ctx); } std::unique_ptr<Writer> getWriter() override; diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h index aa855748f0a..683d1e3d3c8 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h @@ -109,9 +109,6 @@ private: /// \brief TargetHandler for Hexagon class HexagonTargetHandler final : public TargetHandler { - typedef ELFReader<HexagonELFFile> ObjReader; - typedef ELFReader<DynamicFile<ELF32LE>> ELFDSOReader; - public: HexagonTargetHandler(HexagonLinkingContext &targetInfo); @@ -120,11 +117,11 @@ public: } std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<HexagonELFFile>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<ELFDSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELF32LE>>>(_ctx); } std::unique_ptr<Writer> getWriter() override; diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h index 6459eb4defe..e3dae9181ae 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h @@ -22,9 +22,6 @@ namespace elf { /// \brief TargetHandler for Mips template <class ELFT> class MipsTargetHandler final : public TargetHandler { - typedef ELFReader<MipsELFFile<ELFT>> ObjReader; - typedef ELFReader<DynamicFile<ELFT>> DSOReader; - public: MipsTargetHandler(MipsLinkingContext &ctx) : _ctx(ctx), _targetLayout(new MipsTargetLayout<ELFT>(ctx)), @@ -32,11 +29,11 @@ public: createMipsRelocationHandler<ELFT>(ctx, *_targetLayout)) {} std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<MipsELFFile<ELFT>>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<DSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELFT>>>(_ctx); } const TargetRelocationHandler &getRelocationHandler() const override { diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h index b8fb66445e1..fecf9abfc67 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h @@ -20,9 +20,6 @@ namespace elf { class X86LinkingContext; class X86TargetHandler final : public TargetHandler { - typedef ELFReader<ELFFile<ELF32LE>> ObjReader; - typedef ELFReader<DynamicFile<ELF32LE>> DSOReader; - public: X86TargetHandler(X86LinkingContext &ctx); @@ -31,11 +28,11 @@ public: } std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<ELFFile<ELF32LE>>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<DSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELF32LE>>>(_ctx); } std::unique_ptr<Writer> getWriter() override; diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h index 12724f1a8a4..53fc15ff023 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h @@ -58,9 +58,6 @@ private: }; class X86_64TargetHandler : public TargetHandler { - typedef ELFReader<ELFFile<ELF64LE>> ObjReader; - typedef ELFReader<DynamicFile<ELF64LE>> DSOReader; - public: X86_64TargetHandler(X86_64LinkingContext &ctx); @@ -69,11 +66,11 @@ public: } std::unique_ptr<Reader> getObjReader() override { - return llvm::make_unique<ObjReader>(_ctx); + return llvm::make_unique<ELFReader<ELFFile<ELF64LE>>>(_ctx); } std::unique_ptr<Reader> getDSOReader() override { - return llvm::make_unique<DSOReader>(_ctx); + return llvm::make_unique<ELFReader<DynamicFile<ELF64LE>>>(_ctx); } std::unique_ptr<Writer> getWriter() override; |
