From baceaf65f258d2da422ddd0abdf2452937bd7b6d Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 19 Oct 2022 13:03:07 +0200 Subject: [PATCH] macho: fix incorrectly erroring out with multiple sym definition --- src/link/MachO.zig | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/link/MachO.zig b/src/link/MachO.zig index c7046cec9e..30bbc2b6c0 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -2702,13 +2702,17 @@ pub fn updateDeclExports( self.resolveGlobalSymbol(sym_loc) catch |err| switch (err) { error.MultipleSymbolDefinitions => { - _ = try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create( - gpa, - decl.srcLoc(), - \\LinkError: symbol '{s}' defined multiple times - , - .{exp_name}, - )); + // TODO: this needs rethinking + const global = self.getGlobal(exp_name).?; + if (sym_loc.sym_index != global.sym_index and global.file != null) { + _ = try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create( + gpa, + decl.srcLoc(), + \\LinkError: symbol '{s}' defined multiple times + , + .{exp_name}, + )); + } }, else => |e| return e, };