diff options
Diffstat (limited to 'lld/lib/ReaderWriter/ELF')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Atoms.h | 12 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/File.h | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Reader.cpp | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/SectionChunks.h | 6 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/SegmentChunks.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Atoms.h b/lld/lib/ReaderWriter/ELF/Atoms.h index a7c14413506..d1153e7868c 100644 --- a/lld/lib/ReaderWriter/ELF/Atoms.h +++ b/lld/lib/ReaderWriter/ELF/Atoms.h @@ -170,7 +170,7 @@ public: StringRef sectionName, const Elf_Sym *symbol, const Elf_Shdr *section, - llvm::ArrayRef<uint8_t> contentData, + ArrayRef<uint8_t> contentData, unsigned int referenceStart, unsigned int referenceEnd, std::vector<ELFReference<ELFT>*> &referenceList) @@ -482,7 +482,7 @@ public: return false; } - virtual llvm::ArrayRef<uint8_t> rawContent() const { + virtual ArrayRef<uint8_t> rawContent() const { return _contentData; } @@ -525,7 +525,7 @@ private: const Elf_Sym *_symbol; const Elf_Shdr *_section; /// \brief Holds the bits that make up the atom. - llvm::ArrayRef<uint8_t> _contentData; + ArrayRef<uint8_t> _contentData; uint64_t _ordinal; unsigned int _referenceStartIndex; @@ -543,7 +543,7 @@ template <class ELFT> class ELFMergeAtom LLVM_FINAL : public DefinedAtom { public: ELFMergeAtom(const ELFFile<ELFT> &file, StringRef sectionName, - const Elf_Shdr *section, llvm::ArrayRef<uint8_t> contentData, + const Elf_Shdr *section, ArrayRef<uint8_t> contentData, uint64_t offset) : _owningFile(file), _sectionName(sectionName), _section(section), _contentData(contentData), _offset(offset) { @@ -593,7 +593,7 @@ public: virtual bool isAlias() const { return false; } - virtual llvm::ArrayRef<uint8_t> rawContent() const { return _contentData; } + virtual ArrayRef<uint8_t> rawContent() const { return _contentData; } DefinedAtom::reference_iterator begin() const { uintptr_t index = 0; @@ -617,7 +617,7 @@ private: StringRef _sectionName; const Elf_Shdr *_section; /// \brief Holds the bits that make up the atom. - llvm::ArrayRef<uint8_t> _contentData; + ArrayRef<uint8_t> _contentData; uint64_t _ordinal; uint64_t _offset; }; diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp index 6c7be8eef5c..10f91380467 100644 --- a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp @@ -134,7 +134,7 @@ ELFLinkingContext::create(llvm::Triple triple) { } } -llvm::ErrorOr<StringRef> ELFLinkingContext::searchLibrary( +ErrorOr<StringRef> ELFLinkingContext::searchLibrary( StringRef libName, const std::vector<StringRef> &searchPath) const { bool foundFile = false; StringRef pathref; diff --git a/lld/lib/ReaderWriter/ELF/File.h b/lld/lib/ReaderWriter/ELF/File.h index 85f324f1e25..5bd9e37d01c 100644 --- a/lld/lib/ReaderWriter/ELF/File.h +++ b/lld/lib/ReaderWriter/ELF/File.h @@ -122,7 +122,7 @@ public: : File(name, kindObject), _elfLinkingContext(context) {} ELFFile(const ELFLinkingContext &context, - std::unique_ptr<llvm::MemoryBuffer> MB, llvm::error_code &EC) + std::unique_ptr<MemoryBuffer> MB, error_code &EC) : File(MB->getBufferIdentifier(), kindObject), _elfLinkingContext(context), _ordinal(0), _doStringsMerge(false) { _objFile.reset(new llvm::object::ELFFile<ELFT>(MB.release(), EC)); diff --git a/lld/lib/ReaderWriter/ELF/Reader.cpp b/lld/lib/ReaderWriter/ELF/Reader.cpp index 04ba5b27447..f1cd9f1cf03 100644 --- a/lld/lib/ReaderWriter/ELF/Reader.cpp +++ b/lld/lib/ReaderWriter/ELF/Reader.cpp @@ -90,7 +90,7 @@ public: std::size_t MaxAlignment = 1ULL << llvm::countTrailingZeros(uintptr_t(mb->getBufferStart())); - llvm::error_code ec; + error_code ec; switch (FileType) { case llvm::sys::fs::file_magic::elf_relocatable: { std::unique_ptr<File> f(createELF<ELFFileCreateELFTraits>( diff --git a/lld/lib/ReaderWriter/ELF/SectionChunks.h b/lld/lib/ReaderWriter/ELF/SectionChunks.h index 2316d46bebf..7ceeb36f666 100644 --- a/lld/lib/ReaderWriter/ELF/SectionChunks.h +++ b/lld/lib/ReaderWriter/ELF/SectionChunks.h @@ -378,7 +378,7 @@ void AtomSection<ELFT>::write(ELFWriter *writer, if (!definedAtom->occupiesDiskSpace()) return; // Copy raw content of atom to file buffer. - llvm::ArrayRef<uint8_t> content = definedAtom->rawContent(); + ArrayRef<uint8_t> content = definedAtom->rawContent(); uint64_t contentSize = content.size(); if (contentSize == 0) return; @@ -817,9 +817,9 @@ void SymbolTable<ELFT>::addSymbol(const Atom *atom, int32_t sectionIndex, else if (const AbsoluteAtom *aa = dyn_cast<const AbsoluteAtom>(atom)) addAbsoluteAtom(symbol, aa, addr); else if (isa<const SharedLibraryAtom>(atom)) - addSharedLibAtom(symbol, llvm::dyn_cast<SharedLibraryAtom>(atom)); + addSharedLibAtom(symbol, dyn_cast<SharedLibraryAtom>(atom)); else - addUndefinedAtom(symbol, llvm::dyn_cast<UndefinedAtom>(atom)); + addUndefinedAtom(symbol, dyn_cast<UndefinedAtom>(atom)); _symbolTable.push_back(SymbolEntry(atom, symbol, atomLayout)); this->_fsize += sizeof(Elf_Sym); diff --git a/lld/lib/ReaderWriter/ELF/SegmentChunks.h b/lld/lib/ReaderWriter/ELF/SegmentChunks.h index ef1de72c457..1afc6513068 100644 --- a/lld/lib/ReaderWriter/ELF/SegmentChunks.h +++ b/lld/lib/ReaderWriter/ELF/SegmentChunks.h @@ -548,7 +548,7 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t &addr) { // Check if the segment is of type TLS // The sections that belong to the TLS segment have their // virtual addresses that are relative To TP - Section<ELFT> *currentSection = llvm::dyn_cast<Section<ELFT> >(section); + Section<ELFT> *currentSection = dyn_cast<Section<ELFT> >(section); if (currentSection) isTLSSegment = (currentSection->getSegmentType() == llvm::ELF::PT_TLS); |

