authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-07-17 18:43:28+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-07-17 18:43:28+02:00
logd8c4838c7da9efef07fcf5b8e709bb2a65cd2209
tree20b60ae8028351ea588a3605b6a1fc1e40722320
parent9f20a51555169dfcc531b06390001d3dbd78094d

zld: fix incorrect global symbol collision check

1 files changed, 2 insertions(+), 2 deletions(-)

src/link/MachO/Zld.zig+2-2
...@@ -1489,8 +1489,8 @@ fn resolveSymbolsInObject(self: *Zld, object_id: u16) !void {...@@ -1489,8 +1489,8 @@ fn resolveSymbolsInObject(self: *Zld, object_id: u16) !void {
1489 .global => {1489 .global => {
1490 const global = &self.globals.items[resolv.where_index];1490 const global = &self.globals.items[resolv.where_index];
14911491
1492 if (!(symbolIsWeakDef(sym) and symbolIsPext(sym)) and1492 if (!(symbolIsWeakDef(sym) or symbolIsPext(sym)) and
1493 !(symbolIsWeakDef(global.*) and symbolIsPext(global.*)))1493 !(symbolIsWeakDef(global.*) or symbolIsPext(global.*)))
1494 {1494 {
1495 log.err("symbol '{s}' defined multiple times", .{sym_name});1495 log.err("symbol '{s}' defined multiple times", .{sym_name});
1496 log.err(" first definition in '{s}'", .{self.objects.items[resolv.file].name.?});1496 log.err(" first definition in '{s}'", .{self.objects.items[resolv.file].name.?});