diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-04-14 17:32:13 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-04-14 17:32:13 +0000 |
| commit | cfeb2512fdee6ee2742cecfc0adc15392a17fc59 (patch) | |
| tree | 1c0a88707e29907a2548026c65884358f66ab12c /lld/lib/ReaderWriter/ELF/ARM | |
| parent | dcf06f42324a38d43f40147028d9d4273a2d6ef2 (diff) | |
| download | bcm5719-llvm-cfeb2512fdee6ee2742cecfc0adc15392a17fc59.tar.gz bcm5719-llvm-cfeb2512fdee6ee2742cecfc0adc15392a17fc59.zip | |
ELF: Remove ELFT template argument when referring the base class.
We don't need to repeat the template argument. They are not
ambiguous. MIPS is parameterized for ELFT, so we can't do this
for MIPS, though.
llvm-svn: 234913
Diffstat (limited to 'lld/lib/ReaderWriter/ELF/ARM')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h | 8 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h | 5 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h b/lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h index 76d8477850a..c2418a0ac7e 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h @@ -58,7 +58,7 @@ class ARMELFFile : public ELFFile<ELF32LE> { public: ARMELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx) - : ELFFile<ELF32LE>(std::move(mb), ctx) {} + : ELFFile(std::move(mb), ctx) {} protected: /// Returns initial addend; for ARM it is 0, because it is read diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h b/lld/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h index 401ffbf5bde..ed8e237ae51 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h @@ -48,16 +48,16 @@ private: ARMExecutableWriter::ARMExecutableWriter(ARMLinkingContext &ctx, ARMTargetLayout &layout) - : ExecutableWriter<ELF32LE>(ctx, layout), _ctx(ctx), _armLayout(layout) {} + : ExecutableWriter(ctx, layout), _ctx(ctx), _armLayout(layout) {} void ARMExecutableWriter::createImplicitFiles( std::vector<std::unique_ptr<File>> &result) { - ExecutableWriter<ELF32LE>::createImplicitFiles(result); + ExecutableWriter::createImplicitFiles(result); } void ARMExecutableWriter::finalizeDefaultAtomValues() { // Finalize the atom values that are part of the parent. - ExecutableWriter<ELF32LE>::finalizeDefaultAtomValues(); + ExecutableWriter::finalizeDefaultAtomValues(); AtomLayout *gotAtom = _armLayout.findAbsoluteAtom(gotSymbol); if (gotAtom) { if (auto gotpltSection = _armLayout.findOutputSection(".got.plt")) @@ -86,7 +86,7 @@ void ARMExecutableWriter::processUndefinedSymbol( } std::error_code ARMExecutableWriter::setELFHeader() { - if (std::error_code ec = ExecutableWriter<ELF32LE>::setELFHeader()) + if (std::error_code ec = ExecutableWriter::setELFHeader()) return ec; // Set ARM-specific flags. diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h b/lld/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h index f31449d55ee..a48628b9aee 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h @@ -25,12 +25,11 @@ public: }; ARMSymbolTable::ARMSymbolTable(const ELFLinkingContext &ctx) - : SymbolTable<ELF32LE>(ctx, ".symtab", - TargetLayout<ELF32LE>::ORDER_SYMBOL_TABLE) {} + : SymbolTable(ctx, ".symtab", TargetLayout<ELF32LE>::ORDER_SYMBOL_TABLE) {} void ARMSymbolTable::addDefinedAtom(Elf_Sym &sym, const DefinedAtom *da, int64_t addr) { - SymbolTable<ELF32LE>::addDefinedAtom(sym, da, addr); + SymbolTable::addDefinedAtom(sym, da, addr); // Set zero bit to distinguish real symbols addressing Thumb instructions. // Don't care about mapping symbols like $t and others. diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h index 4a2d7165eaa..c8c7eb8cf8a 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h @@ -22,7 +22,7 @@ namespace elf { class ARMTargetLayout : public TargetLayout<ELF32LE> { public: - ARMTargetLayout(ELFLinkingContext &ctx) : TargetLayout<ELF32LE>(ctx) {} + ARMTargetLayout(ELFLinkingContext &ctx) : TargetLayout(ctx) {} uint64_t getGOTSymAddr() { std::call_once(_gotSymOnce, [this]() { |

