mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 14:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

zld: fix symbol resolution from interdep archives

Browse Source 
Fixes symbol resolution if an archive occurring later in the linker
line depends on a object embedded within the archive that occurred
before.
This commit is contained in:
Jakub Konka 2021-04-13 13:36:08 +02:00
parent 65e4725aba
commit 461543a5fd
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/link/MachO/Zld.zig
View File

@ -1284,17 +1284,14 @@ fn resolveSymbols(self: *Zld) !void {
}
// Second pass, resolve symbols in static libraries.
var next: usize = 0;
var hit: bool = undefined;
while (true) {
var archive = &self.archives.items[next];
hit = false;
for (self.symtab.items()) |entry| {
if (entry.value.tag != .undef) continue;
const sym_name = entry.value.name;
var next_sym: usize = 0;
var nsyms: usize = self.symtab.items().len;
while (next_sym < nsyms) : (next_sym += 1) {
const sym = self.symtab.items()[next_sym];
if (sym.value.tag != .undef) continue;
const sym_name = sym.value.name;
for (self.archives.items) |archive| {
// Check if the entry exists in a static archive.
const offsets = archive.toc.get(sym_name) orelse {
// No hit.
@ -1307,18 +1304,9 @@ fn resolveSymbols(self: *Zld) !void {
try self.objects.append(self.allocator, object);
try self.resolveSymbolsInObject(object_id);
hit = true;
nsyms = self.symtab.items().len;
break;
}
if (!hit) {
// Next archive.
next += 1;
if (next == self.archives.items.len) {
break;
}
archive = &self.archives.items[next];
}
}
// Third pass, resolve symbols in dynamic libraries.