[lld] r234076 - ELF: Remove ELF{Object,DSO}Reader alias templates.
Rui Ueyama
ruiu at google.com
Fri Apr 3 19:16:26 PDT 2015
Author: ruiu
Date: Fri Apr 3 21:16:26 2015
New Revision: 234076
URL: http://llvm.org/viewvc/llvm-project?rev=234076&view=rev
Log:
ELF: Remove ELF{Object,DSO}Reader alias templates.
Because of the previous change (r234074), ELFObjectReader became just
an alias for ELFReader. We can replace all occurrences of ELFObjectReader
with ELFReader.
In this patch, I also replaced ELFDSOReader to remove the alias template.
Modified:
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/ELFReader.h
lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h Fri Apr 3 21:16:26 2015
@@ -21,9 +21,8 @@ class AArch64LinkingContext;
class AArch64TargetHandler final : public TargetHandler {
typedef llvm::object::ELFType<llvm::support::little, 2, true> ELFTy;
- typedef ELFObjectReader<ELFTy, AArch64LinkingContext, lld::elf::ELFFile>
- ObjReader;
- typedef ELFDSOReader<AArch64ELFType, AArch64LinkingContext> DSOReader;
+ typedef ELFReader<ELFTy, AArch64LinkingContext, ELFFile> ObjReader;
+ typedef ELFReader<ELFTy, AArch64LinkingContext, DynamicFile> DSOReader;
public:
AArch64TargetHandler(AArch64LinkingContext &ctx);
Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h Fri Apr 3 21:16:26 2015
@@ -61,9 +61,8 @@ private:
class ARMTargetHandler final : public TargetHandler {
typedef llvm::object::ELFType<llvm::support::little, 2, false> ELFTy;
- typedef ELFObjectReader<ELFTy, ARMLinkingContext, lld::elf::ARMELFFile>
- ObjReader;
- typedef ELFDSOReader<ELFTy, ARMLinkingContext> DSOReader;
+ typedef ELFReader<ELFTy, ARMLinkingContext, ARMELFFile> ObjReader;
+ typedef ELFReader<ELFTy, ARMLinkingContext, DynamicFile> DSOReader;
public:
ARMTargetHandler(ARMLinkingContext &ctx);
Modified: lld/trunk/lib/ReaderWriter/ELF/ELFReader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFReader.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFReader.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFReader.h Fri Apr 3 21:16:26 2015
@@ -56,12 +56,6 @@ protected:
ContextT &_ctx;
};
-template <typename ELFT, typename ContextT, template <typename> class FileT>
-using ELFObjectReader = ELFReader<ELFT, ContextT, FileT>;
-
-template <typename ELFT, typename ContextT>
-using ELFDSOReader = ELFReader<ELFT, ContextT, DynamicFile>;
-
} // namespace elf
} // namespace lld
Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h Fri Apr 3 21:16:26 2015
@@ -101,9 +101,8 @@ private:
/// \brief TargetHandler for Hexagon
class HexagonTargetHandler final : public TargetHandler {
typedef llvm::object::ELFType<llvm::support::little, 2, false> ELFTy;
- typedef ELFObjectReader<ELFTy, HexagonLinkingContext,
- lld::elf::HexagonELFFile> ObjReader;
- typedef ELFDSOReader<ELFTy, HexagonLinkingContext> ELFDSOReader;
+ typedef ELFReader<ELFTy, HexagonLinkingContext, HexagonELFFile> ObjReader;
+ typedef ELFReader<ELFTy, HexagonLinkingContext, DynamicFile> ELFDSOReader;
public:
HexagonTargetHandler(HexagonLinkingContext &targetInfo);
Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h Fri Apr 3 21:16:26 2015
@@ -88,9 +88,8 @@ private:
/// \brief TargetHandler for Mips
template <class ELFT> class MipsTargetHandler final : public TargetHandler {
- typedef ELFObjectReader<ELFT, MipsLinkingContext, lld::elf::MipsELFFile>
- ObjReader;
- typedef ELFDSOReader<ELFT, MipsLinkingContext> DSOReader;
+ typedef ELFReader<ELFT, MipsLinkingContext, MipsELFFile> ObjReader;
+ typedef ELFReader<ELFT, MipsLinkingContext, DynamicFile> DSOReader;
public:
MipsTargetHandler(MipsLinkingContext &ctx)
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h Fri Apr 3 21:16:26 2015
@@ -21,9 +21,8 @@ class X86LinkingContext;
class X86TargetHandler final : public TargetHandler {
typedef llvm::object::ELFType<llvm::support::little, 2, false> ELFTy;
- typedef ELFObjectReader<ELFTy, X86LinkingContext, lld::elf::ELFFile>
- ObjReader;
- typedef ELFDSOReader<ELFTy, X86LinkingContext> DSOReader;
+ typedef ELFReader<ELFTy, X86LinkingContext, ELFFile> ObjReader;
+ typedef ELFReader<ELFTy, X86LinkingContext, DynamicFile> DSOReader;
public:
X86TargetHandler(X86LinkingContext &ctx);
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h?rev=234076&r1=234075&r2=234076&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h Fri Apr 3 21:16:26 2015
@@ -59,9 +59,8 @@ private:
class X86_64TargetHandler : public TargetHandler {
typedef llvm::object::ELFType<llvm::support::little, 2, true> ELFTy;
- typedef ELFObjectReader<ELFTy, X86_64LinkingContext, lld::elf::ELFFile>
- ObjReader;
- typedef ELFDSOReader<ELFTy, X86_64LinkingContext> DSOReader;
+ typedef ELFReader<ELFTy, X86_64LinkingContext, ELFFile> ObjReader;
+ typedef ELFReader<ELFTy, X86_64LinkingContext, DynamicFile> DSOReader;
public:
X86_64TargetHandler(X86_64LinkingContext &ctx);
More information about the llvm-commits
mailing list