zig

commit baceaf65f258d2da422ddd0abdf2452937bd7b6d (tree)
parent a32bc0e39c9d2b33547241fcb9868d72e52ee1df
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Wed, 19 Oct 2022 13:03:07 +0200

macho: fix incorrectly erroring out with multiple sym definition

Diffstat:
M
src/link/MachO.zig
 | 
18
+++++++++++-------

1 file changed, 11 insertions(+), 7 deletions(-)
diff --git 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,
         };