motiejus/zig
1
Fork 0
Code Releases Activity

zld: fix incorrect global symbol collision check

Browse Source
This commit is contained in:
Jakub Konka
2021-07-17 18:43:28 +02:00
parent 9f20a51555
commit d8c4838c7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.?});