From d8c4838c7da9efef07fcf5b8e709bb2a65cd2209 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Sat, 17 Jul 2021 18:43:28 +0200 Subject: zld: fix incorrect global symbol collision check --- src/link/MachO/Zld.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/link/MachO/Zld.zig b/src/link/MachO/Zld.zig index 633be212cd..4d58de25c8 100644 --- a/src/link/MachO/Zld.zig +++ b/src/link/MachO/Zld.zig @@ -1489,8 +1489,8 @@ fn resolveSymbolsInObject(self: *Zld, object_id: u16) !void { .global => { const global = &self.globals.items[resolv.where_index]; - if (!(symbolIsWeakDef(sym) and symbolIsPext(sym)) and - !(symbolIsWeakDef(global.*) and symbolIsPext(global.*))) + if (!(symbolIsWeakDef(sym) or symbolIsPext(sym)) and + !(symbolIsWeakDef(global.*) or symbolIsPext(global.*))) { log.err("symbol '{s}' defined multiple times", .{sym_name}); log.err(" first definition in '{s}'", .{self.objects.items[resolv.file].name.?}); -- cgit v1.2.3