From 461543a5fd27415710f027d034b83ef196bc8a44 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 13 Apr 2021 13:36:08 +0200 Subject: zld: fix symbol resolution from interdep archives Fixes symbol resolution if an archive occurring later in the linker line depends on a object embedded within the archive that occurred before. --- src/link/MachO/Zld.zig | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'src/link') diff --git a/src/link/MachO/Zld.zig b/src/link/MachO/Zld.zig index 56a35a3bca..ae475ab30d 100644 --- a/src/link/MachO/Zld.zig +++ b/src/link/MachO/Zld.zig @@ -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. -- cgit v1.2.3