diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h index e67144275ea..831d82f93f6 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h @@ -76,7 +76,7 @@ template <class ELFT> void MipsDynamicLibraryWriter<ELFT>::createDefaultSections() { DynamicLibraryWriter<ELFT>::createDefaultSections(); const auto &ctx = static_cast<const MipsLinkingContext &>(this->_ctx); - const auto &mask = ctx.getMergeReginfoMask(); + const auto &mask = ctx.getMergedReginfoMask(); if (!mask.hasValue()) return; if (ELFT::Is64Bits) diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h index 0f89213a4f7..8cc1285c4cd 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h @@ -127,7 +127,7 @@ void MipsExecutableWriter<ELFT>::finalizeDefaultAtomValues() { template <class ELFT> void MipsExecutableWriter<ELFT>::createDefaultSections() { ExecutableWriter<ELFT>::createDefaultSections(); const auto &ctx = static_cast<const MipsLinkingContext &>(this->_ctx); - const auto &mask = ctx.getMergeReginfoMask(); + const auto &mask = ctx.getMergedReginfoMask(); if (!mask.hasValue()) return; if (ELFT::Is64Bits) diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp index fcbd72471ee..4cb06abba6c 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp @@ -59,7 +59,7 @@ uint32_t MipsLinkingContext::getMergedELFFlags() const { } const llvm::Optional<MipsReginfo> & -MipsLinkingContext::getMergeReginfoMask() const { +MipsLinkingContext::getMergedReginfoMask() const { return _reginfoMask; } diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h index d77ba25c965..8bcade4c692 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h @@ -50,7 +50,7 @@ public: void mergeReginfoMask(const MipsReginfo &info); uint32_t getMergedELFFlags() const; - const llvm::Optional<MipsReginfo> &getMergeReginfoMask() const; + const llvm::Optional<MipsReginfo> &getMergedReginfoMask() const; void registerRelocationNames(Registry &r) override; |
