intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-23 16:06:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lld][WebAssembly] Use the archive offset with --whole-archive (#78791)

Browse Source 
This essentially ports 0b1413a8 from the ELF linker.
This commit is contained in:
Sam Clegg
2024-01-19 14:42:03 -08:00
committed by GitHub
parent f9bc1ee3fc
commit 39e024d9e2
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lld/wasm/Driver.cpp
View File

@@ -233,19 +233,20 @@ static void readImportFile(StringRef filename) {
// Returns slices of MB by parsing MB as an archive file.
// Each slice consists of a member file in the archive.
std::vector<MemoryBufferRef> static getArchiveMembers(MemoryBufferRef mb) {
std::vector<std::pair<MemoryBufferRef, uint64_t>> static getArchiveMembers(
MemoryBufferRef mb) {
std::unique_ptr<Archive> file =
CHECK(Archive::create(mb),
mb.getBufferIdentifier() + ": failed to parse archive");
std::vector<MemoryBufferRef> v;
std::vector<std::pair<MemoryBufferRef, uint64_t>> v;
Error err = Error::success();
for (const Archive::Child &c : file->children(err)) {
MemoryBufferRef mbref =
CHECK(c.getMemoryBufferRef(),
mb.getBufferIdentifier() +
": could not get the buffer for a child of the archive");
v.push_back(mbref);
v.push_back(std::make_pair(mbref, c.getChildOffset()));
}
if (err)
fatal(mb.getBufferIdentifier() +
@@ -273,8 +274,8 @@ void LinkerDriver::addFile(StringRef path) {
// Handle -whole-archive.
if (inWholeArchive) {
for (MemoryBufferRef &m : getArchiveMembers(mbref)) {
auto *object = createObjectFile(m, path);
for (const auto &[m, offset] : getArchiveMembers(mbref)) {
auto *object = createObjectFile(m, path, offset);
// Mark object as live; object members are normally not
// live by default but -whole-archive is designed to treat
// them as such.