mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-27 16:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: exclude tentative def before checking for collision

Browse Source 
when resolving global symbols.
This commit is contained in:
Jakub Konka 2021-08-03 23:39:32 +02:00
parent 35403d41ce
commit f01366e8b3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/link/MachO.zig
View File

@ -2167,19 +2167,16 @@ fn resolveSymbolsInObject(
.global => {
const global = &self.globals.items[resolv.where_index];
if (!(symbolIsWeakDef(sym) or symbolIsPext(sym)) and
if (symbolIsTentative(global.*)) {
_ = tentatives.fetchSwapRemove(resolv.where_index);
} else 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});
log.err(" next definition in '{s}'", .{object.name});
return error.MultipleSymbolDefinitions;
}
if (symbolIsWeakDef(sym) or symbolIsPext(sym)) continue; // Current symbol is weak, so skip it.
if (symbolIsTentative(global.*)) {
_ = tentatives.fetchSwapRemove(resolv.where_index);
}
} else if (symbolIsWeakDef(sym) or symbolIsPext(sym)) continue; // Current symbol is weak, so skip it.
// Otherwise, update the resolver and the global symbol.
global.n_type = sym.n_type;