diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2023-04-14 21:41:27 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2023-07-23 17:38:08 +0000 |
commit | 320d4fb58b6b1c6a0c7ffeab3d4672d1479d5e17 (patch) | |
tree | 4b5e279a6f091bb6bdc639752cf4139dfd7053a4 /contrib/llvm-project/lld/ELF/MapFile.cpp | |
parent | 814cfa6ad43c73de9b8030f241f516dad3f669ef (diff) |
Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-16-init-18548-gb0daacf58f41.
PR: 271047
MFC after: 1 month
(cherry picked from commit bdd1243df58e60e85101c09001d9812a789b6bc4)
Diffstat (limited to 'contrib/llvm-project/lld/ELF/MapFile.cpp')
-rw-r--r-- | contrib/llvm-project/lld/ELF/MapFile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/llvm-project/lld/ELF/MapFile.cpp b/contrib/llvm-project/lld/ELF/MapFile.cpp index 893511929a3a..e28656cd38dc 100644 --- a/contrib/llvm-project/lld/ELF/MapFile.cpp +++ b/contrib/llvm-project/lld/ELF/MapFile.cpp @@ -55,11 +55,11 @@ static void writeHeader(raw_ostream &os, uint64_t vma, uint64_t lma, // Returns a list of all symbols that we want to print out. static std::vector<Defined *> getSymbols() { std::vector<Defined *> v; - for (ELFFileBase *file : ctx->objectFiles) + for (ELFFileBase *file : ctx.objectFiles) for (Symbol *b : file->getSymbols()) if (auto *dr = dyn_cast<Defined>(b)) if (!dr->isSection() && dr->section && dr->section->isLive() && - (dr->file == file || dr->needsCopy || dr->section->bss)) + (dr->file == file || dr->hasFlag(NEEDS_COPY) || dr->section->bss)) v.push_back(dr); return v; } @@ -169,7 +169,7 @@ static void writeMapFile(raw_fd_ostream &os) { } osec = &cast<OutputDesc>(cmd)->osec; - writeHeader(os, osec->addr, osec->getLMA(), osec->size, osec->alignment); + writeHeader(os, osec->addr, osec->getLMA(), osec->size, osec->addralign); os << osec->name << '\n'; // Dump symbols for each input section. @@ -182,7 +182,7 @@ static void writeMapFile(raw_fd_ostream &os) { } writeHeader(os, isec->getVA(), osec->getLMA() + isec->outSecOff, - isec->getSize(), isec->alignment); + isec->getSize(), isec->addralign); os << indent8 << toString(isec) << '\n'; for (Symbol *sym : llvm::make_first_range(sectionSyms[isec])) os << symStr[sym] << '\n'; @@ -224,7 +224,7 @@ static void writeMapFile(raw_fd_ostream &os) { static void writeCref(raw_fd_ostream &os) { // Collect symbols and files. MapVector<Symbol *, SetVector<InputFile *>> map; - for (ELFFileBase *file : ctx->objectFiles) { + for (ELFFileBase *file : ctx.objectFiles) { for (Symbol *sym : file->getSymbols()) { if (isa<SharedSymbol>(sym)) map[sym].insert(file); |