From 537287041bdff4e384d31f9258aab1452405c73d Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Tue, 31 Mar 2015 19:21:43 +0000 Subject: [PATCH] Remove virtual and add override. llvm-svn: 233735 --- .../ELF/Hexagon/HexagonDynamicLibraryWriter.h | 8 ++++---- lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h | 14 +++++++------- .../ELF/Hexagon/HexagonExecutableWriter.h | 8 ++++---- .../ELF/Hexagon/HexagonTargetHandler.h | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h index 3dac56f180a9..88d60748ff51 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h @@ -26,18 +26,18 @@ public: protected: // Add any runtime files and their atoms to the output - virtual bool createImplicitFiles(std::vector> &); + bool createImplicitFiles(std::vector> &) override; - virtual void finalizeDefaultAtomValues(); + void finalizeDefaultAtomValues() override; - virtual std::error_code setELFHeader() { + std::error_code setELFHeader() override { DynamicLibraryWriter::setELFHeader(); setHexagonELFHeader(*this->_elfHeader); return std::error_code(); } private: - void addDefaultAtoms() { + void addDefaultAtoms() override { _hexagonRuntimeFile->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"); _hexagonRuntimeFile->addAbsoluteAtom("_DYNAMIC"); } diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h index d251ca4fa0aa..a6fca74574be 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h @@ -28,7 +28,7 @@ public: HexagonELFDefinedAtom(T&&... args) : ELFDefinedAtom(std::forward(args)...) {} - virtual DefinedAtom::ContentType contentType() const { + DefinedAtom::ContentType contentType() const override { if (this->_contentType != DefinedAtom::typeUnknown) return this->_contentType; else if (this->_section->sh_flags & llvm::ELF::SHF_HEX_GPREL) { @@ -40,7 +40,7 @@ public: return ELFDefinedAtom::contentType(); } - virtual DefinedAtom::ContentPermissions permissions() const { + DefinedAtom::ContentPermissions permissions() const override { if (this->_section->sh_flags & llvm::ELF::SHF_HEX_GPREL) return DefinedAtom::permRW_; return ELFDefinedAtom::permissions(); @@ -71,13 +71,13 @@ public: return false; } - virtual uint64_t size() const { + uint64_t size() const override { if (isSmallCommonSymbol()) return this->_symbol->st_size; return ELFCommonAtom::size(); } - virtual DefinedAtom::Merge merge() const { + DefinedAtom::Merge merge() const override { if (this->_symbol->getBinding() == llvm::ELF::STB_WEAK) return DefinedAtom::mergeAsWeak; if (isSmallCommonSymbol()) @@ -85,19 +85,19 @@ public: return ELFCommonAtom::merge(); } - virtual DefinedAtom::ContentType contentType() const { + DefinedAtom::ContentType contentType() const override { if (isSmallCommonSymbol()) return DefinedAtom::typeZeroFillFast; return ELFCommonAtom::contentType(); } - virtual DefinedAtom::Alignment alignment() const { + DefinedAtom::Alignment alignment() const override { if (isSmallCommonSymbol()) return DefinedAtom::Alignment(this->_symbol->st_value); return 1; } - virtual DefinedAtom::ContentPermissions permissions() const { + DefinedAtom::ContentPermissions permissions() const override { if (isSmallCommonSymbol()) return DefinedAtom::permRW_; return ELFCommonAtom::permissions(); diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h index f29ec623fb0a..0ebcd7170935 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h @@ -26,18 +26,18 @@ public: protected: // Add any runtime files and their atoms to the output - virtual bool createImplicitFiles(std::vector> &); + bool createImplicitFiles(std::vector> &) override; - virtual void finalizeDefaultAtomValues(); + void finalizeDefaultAtomValues() override; - virtual std::error_code setELFHeader() { + std::error_code setELFHeader() override { ExecutableWriter::setELFHeader(); setHexagonELFHeader(*this->_elfHeader); return std::error_code(); } private: - void addDefaultAtoms() { + void addDefaultAtoms() override { _hexagonRuntimeFile->addAbsoluteAtom("_SDA_BASE_"); if (this->_ctx.isDynamic()) { _hexagonRuntimeFile->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"); diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h index 4090e5559a8e..fe75c906ad7f 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h @@ -36,8 +36,8 @@ public: } /// \brief Return the section order for a input section - virtual Layout::SectionOrder getSectionOrder( - StringRef name, int32_t contentType, int32_t contentPermissions) { + Layout::SectionOrder getSectionOrder( + StringRef name, int32_t contentType, int32_t contentPermissions) override { if ((contentType == DefinedAtom::typeDataFast) || (contentType == DefinedAtom::typeZeroFillFast)) return ORDER_SDATA; @@ -47,7 +47,7 @@ public: } /// \brief Return the appropriate input section name. - virtual StringRef getInputSectionName(const DefinedAtom *da) const { + StringRef getInputSectionName(const DefinedAtom *da) const override { switch (da->contentType()) { case DefinedAtom::typeDataFast: case DefinedAtom::typeZeroFillFast: @@ -59,10 +59,10 @@ public: } /// \brief Gets or creates a section. - virtual AtomSection * + AtomSection * createSection(StringRef name, int32_t contentType, DefinedAtom::ContentPermissions contentPermissions, - Layout::SectionOrder sectionOrder) { + Layout::SectionOrder sectionOrder) override { if ((contentType == DefinedAtom::typeDataFast) || (contentType == DefinedAtom::typeZeroFillFast)) return _sdataSection; @@ -71,8 +71,8 @@ public: } /// \brief get the segment type for the section thats defined by the target - virtual Layout::SegmentType - getSegmentType(Section *section) const { + Layout::SegmentType + getSegmentType(Section *section) const override { if (section->order() == ORDER_SDATA) return PT_LOAD; -- 2.34.1