diff options
Diffstat (limited to 'lld/lib/ReaderWriter/ELF/Mips')
5 files changed, 13 insertions, 13 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h index f1e47e7ee31..4a6f852ece5 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h @@ -31,10 +31,10 @@ protected: void finalizeDefaultAtomValues() override; - error_code setELFHeader() override { + std::error_code setELFHeader() override { DynamicLibraryWriter<ELFT>::setELFHeader(); _writeHelper.setELFHeader(*this->_elfHeader); - return error_code(); + return std::error_code(); } LLD_UNIQUE_BUMP_PTR(DynamicTable<ELFT>) createDynamicTable(); diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h b/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h index f58332f52a5..91fcc50bc08 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h @@ -29,7 +29,7 @@ class MipsELFObjectReader : public ELFObjectReader { public: MipsELFObjectReader(bool atomizeStrings) : ELFObjectReader(atomizeStrings) {} - error_code + std::error_code parseFile(std::unique_ptr<MemoryBuffer> &mb, const class Registry &, std::vector<std::unique_ptr<File>> &result) const override { std::size_t maxAlignment = @@ -37,10 +37,10 @@ public: auto f = createELF<MipsELFFileCreateTraits>( llvm::object::getElfArchType(&*mb), maxAlignment, std::move(mb), _atomizeStrings); - if (error_code ec = f.getError()) + if (std::error_code ec = f.getError()) return ec; result.push_back(std::move(*f)); - return error_code(); + return std::error_code(); } }; diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h index 8f28312a1d9..9f6e018eec4 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h @@ -33,10 +33,10 @@ protected: void finalizeDefaultAtomValues() override; - error_code setELFHeader() override { + std::error_code setELFHeader() override { ExecutableWriter<ELFT>::setELFHeader(); _writeHelper.setELFHeader(*this->_elfHeader); - return error_code(); + return std::error_code(); } LLD_UNIQUE_BUMP_PTR(DynamicTable<ELFT>) createDynamicTable(); diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp index d3665022fbc..b3b63f9564d 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp @@ -119,11 +119,11 @@ static void reloc32hi16(uint8_t *location, uint64_t S, int64_t A) { applyReloc(location, (S + A + 0x8000) & 0xffff0000, 0xffffffff); } -error_code MipsTargetRelocationHandler::applyRelocation( +std::error_code MipsTargetRelocationHandler::applyRelocation( ELFWriter &writer, llvm::FileOutputBuffer &buf, const lld::AtomLayout &atom, const Reference &ref) const { if (ref.kindNamespace() != lld::Reference::KindNamespace::ELF) - return error_code(); + return std::error_code(); assert(ref.kindArch() == Reference::KindArch::Mips); AtomLayout *gpAtom = _mipsTargetLayout.getGP(); @@ -216,5 +216,5 @@ error_code MipsTargetRelocationHandler::applyRelocation( } } - return error_code(); + return std::error_code(); } diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h index 174d1bc21f6..35ff6823b65 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h @@ -22,9 +22,9 @@ public: MipsTargetRelocationHandler(MipsTargetLayout<Mips32ElELFType> &layout) : _mipsTargetLayout(layout) {} - error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &, - const lld::AtomLayout &, - const Reference &) const override; + std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &, + const lld::AtomLayout &, + const Reference &) const override; private: MipsTargetLayout<Mips32ElELFType> &_mipsTargetLayout; |
