diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2021-07-17 18:43:28 +0200 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2021-07-17 18:43:28 +0200 |
| commit | d8c4838c7da9efef07fcf5b8e709bb2a65cd2209 (patch) | |
| tree | 20b60ae8028351ea588a3605b6a1fc1e40722320 /src | |
| parent | 9f20a51555169dfcc531b06390001d3dbd78094d (diff) | |
| download | zig-d8c4838c7da9efef07fcf5b8e709bb2a65cd2209.tar.gz zig-d8c4838c7da9efef07fcf5b8e709bb2a65cd2209.zip | |
zld: fix incorrect global symbol collision check
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/MachO/Zld.zig | 4 |
1 files changed, 2 insertions, 2 deletions
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.?}); |