maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 234076
This commit is contained in:
Rui Ueyama 2015-04-04 02:16:26 +00:00
parent 9012028738
commit aa1eb0c2a5
7 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
View File

@ -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);

5
lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
View File

@ -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);

6
lld/lib/ReaderWriter/ELF/ELFReader.h
View File

@ -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

5
lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
View File

@ -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);

5
lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
View File

@ -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)

5
lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
View File

@ -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);

5
lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
View File

@ -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);