Commit 3e73a3c29b597ff05e7a178106ff86056cf4494d | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-04-13 22:48:31+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-04-20 16:55:32+02:00
log	3e73a3c29b597ff05e7a178106ff86056cf4494d
tree	f8f5bb5dee665b08a5a0c605438e3db691e2fee3
parent	be551d85b7610a7e0570023934f9b92ddf129966

zld: treat priv extern as weak symbol

2 files changed, 26 insertions(+), 6 deletions(-)

src
- link
  - MachO.zig
  - MachO
    Zld.zig

src/link/MachO.zig+1-2

...	@@ -645,8 +645,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {	...	@@ -645,8 +645,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {
645	break :blk true;	645	break :blk true;
646	}	646	}
647		647
648	if (self.base.options.link_libcpp or	648	if (self.base.options.output_mode == .Lib or
649	self.base.options.output_mode == .Lib or
650	self.base.options.linker_script != null)	649	self.base.options.linker_script != null)
651	{	650	{
652	// Fallback to LLD in this handful of cases on x86_64 only.	651	// Fallback to LLD in this handful of cases on x86_64 only.

src/link/MachO/Zld.zig+25-4

 @@ -1236,11 +1236,12 @@ fn resolveSymbolsInObject(self: *Zld, object_id: u16) !void {
             continue;
         } else if (Symbol.isGlobal(sym)) {
             const sym_name = object.getString(sym.n_strx);
+            const is_weak = Symbol.isWeakDef(sym) or Symbol.isPext(sym);
             const global = self.symtab.getEntry(sym_name) orelse {
                 // Put new global symbol into the symbol table.
                 const name = try self.allocator.dupe(u8, sym_name);
                 try self.symtab.putNoClobber(self.allocator, name, .{
-                    .tag = if (Symbol.isWeakDef(sym)) .weak else .strong,
+                    .tag = if (is_weak) .weak else .strong,
                     .name = name,
                     .address = 0,
                     .section = 0,
 @@ -1251,10 +1252,15 @@ fn resolveSymbolsInObject(self: *Zld, object_id: u16) !void {
             };
             switch (global.value.tag) {
-                .weak => continue, // If symbol is weak, nothing to do.
+                .weak => {
+                    if (is_weak) continue; // Nothing to do for weak symbol.
+                },
                 .strong => {
-                    log.err("symbol '{s}' defined multiple times", .{sym_name});
+                    if (!is_weak) {
-                    return error.MultipleSymbolDefinitions;
+                        log.err("symbol '{s}' defined multiple times", .{sym_name});
+                        return error.MultipleSymbolDefinitions;
+                    }
+                    continue;
                 },
                 else => {},
             }
 @@ -1340,6 +1346,21 @@ fn resolveSymbols(self: *Zld) !void {
         .section = 0,
         .file = 0,
     });
+    {
+        log.warn("symtab", .{});
+        for (self.symtab.items()) |sym| {
+            switch (sym.value.tag) {
+                .weak, .strong => {
+                    log.warn("    | {s} => {s}", .{ sym.key, self.objects.items[sym.value.file.?].name.? });
+                },
+                .import => {
+                    log.warn("    | {s} => libSystem.B.dylib", .{sym.key});
+                },
+                else => unreachable,
+            }
+        }
+    }
 }
 fn resolveStubsAndGotEntries(self: *Zld) !void {