authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-06-10 11:03:14+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-06-10 11:03:14+02:00
log03cda80a634d82e02e641fe04fa2abda4455966a
tree43593edce0f5c9d4e76725908eccc0efaa8653c3
parent66ff56c58f3ef71f5cc3b8392632b3ec8abec43f

zld: handle aliasing of tentative into regular global

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

src/link/MachO/Object.zig+4-6
...@@ -351,15 +351,15 @@ pub fn parseSymbols(self: *Object) !void {...@@ -351,15 +351,15 @@ pub fn parseSymbols(self: *Object) !void {
351 const sym_name = mem.spanZ(@ptrCast([*:0]const u8, strtab.ptr + sym.n_strx));351 const sym_name = mem.spanZ(@ptrCast([*:0]const u8, strtab.ptr + sym.n_strx));
352352
353 if (Symbol.isStab(sym)) {353 if (Symbol.isStab(sym)) {
354 log.err("stab {s} in {s}", .{ sym_name, self.name.? });354 log.err("unhandled symbol type: stab {s} in {s}", .{ sym_name, self.name.? });
355 return error.UnhandledSymbolType;355 return error.UnhandledSymbolType;
356 }356 }
357 if (Symbol.isIndr(sym)) {357 if (Symbol.isIndr(sym)) {
358 log.err("indirect symbol {s} in {s}", .{ sym_name, self.name.? });358 log.err("unhandled symbol type: indirect {s} in {s}", .{ sym_name, self.name.? });
359 return error.UnhandledSymbolType;359 return error.UnhandledSymbolType;
360 }360 }
361 if (Symbol.isAbs(sym)) {361 if (Symbol.isAbs(sym)) {
362 log.err("absolute symbol {s} in {s}", .{ sym_name, self.name.? });362 log.err("unhandled symbol type: absolute {s} in {s}", .{ sym_name, self.name.? });
363 return error.UnhandledSymbolType;363 return error.UnhandledSymbolType;
364 }364 }
365365
...@@ -399,9 +399,7 @@ pub fn parseSymbols(self: *Object) !void {...@@ -399,9 +399,7 @@ pub fn parseSymbols(self: *Object) !void {
399 .alignment = (sym.n_desc >> 8) & 0x0f,399 .alignment = (sym.n_desc >> 8) & 0x0f,
400 .file = self,400 .file = self,
401 };401 };
402402 break :symbol &tentative.base;
403 log.err("Common symbol {s} in {s}: {}", .{ sym_name, self.name.?, tentative });
404 return error.UnhandledSymbolType;
405 }403 }
406404
407 const undef = try self.allocator.create(Symbol.Unresolved);405 const undef = try self.allocator.create(Symbol.Unresolved);
src/link/MachO/Zld.zig+32
...@@ -84,6 +84,11 @@ common_section_index: ?u16 = null,...@@ -84,6 +84,11 @@ common_section_index: ?u16 = null,
84globals: std.StringArrayHashMapUnmanaged(*Symbol) = .{},84globals: std.StringArrayHashMapUnmanaged(*Symbol) = .{},
85imports: std.StringArrayHashMapUnmanaged(*Symbol) = .{},85imports: std.StringArrayHashMapUnmanaged(*Symbol) = .{},
86unresolved: std.StringArrayHashMapUnmanaged(*Symbol) = .{},86unresolved: std.StringArrayHashMapUnmanaged(*Symbol) = .{},
87tentatives: std.StringArrayHashMapUnmanaged(*Symbol) = .{},
88
89// /// Offset into __DATA,__common section.
90// /// Set if the linker found tentative definitions in any of the objects.
91// tentative_defs_offset: u32 = 0,
8792
88strtab: std.ArrayListUnmanaged(u8) = .{},93strtab: std.ArrayListUnmanaged(u8) = .{},
89strtab_dir: std.StringHashMapUnmanaged(u32) = .{},94strtab_dir: std.StringHashMapUnmanaged(u32) = .{},
...@@ -144,6 +149,7 @@ pub fn deinit(self: *Zld) void {...@@ -144,6 +149,7 @@ pub fn deinit(self: *Zld) void {
144 }149 }
145 self.dylibs.deinit(self.allocator);150 self.dylibs.deinit(self.allocator);
146151
152 self.tentatives.deinit(self.allocator);
147 self.globals.deinit(self.allocator);153 self.globals.deinit(self.allocator);
148 self.imports.deinit(self.allocator);154 self.imports.deinit(self.allocator);
149 self.unresolved.deinit(self.allocator);155 self.unresolved.deinit(self.allocator);
...@@ -1379,6 +1385,10 @@ fn resolveSymbolsInObject(self: *Zld, object: *Object) !void {...@@ -1379,6 +1385,10 @@ fn resolveSymbolsInObject(self: *Zld, object: *Object) !void {
1379 if (sym.cast(Symbol.Regular)) |reg| {1385 if (sym.cast(Symbol.Regular)) |reg| {
1380 if (reg.linkage == .translation_unit) continue; // Symbol local to TU.1386 if (reg.linkage == .translation_unit) continue; // Symbol local to TU.
13811387
1388 if (self.tentatives.fetchSwapRemove(sym.name)) |kv| {
1389 // Create link to the global.
1390 kv.value.alias = sym;
1391 }
1382 if (self.unresolved.fetchSwapRemove(sym.name)) |kv| {1392 if (self.unresolved.fetchSwapRemove(sym.name)) |kv| {
1383 // Create link to the global.1393 // Create link to the global.
1384 kv.value.alias = sym;1394 kv.value.alias = sym;
...@@ -1412,11 +1422,33 @@ fn resolveSymbolsInObject(self: *Zld, object: *Object) !void {...@@ -1412,11 +1422,33 @@ fn resolveSymbolsInObject(self: *Zld, object: *Object) !void {
14121422
1413 g_sym.alias = sym;1423 g_sym.alias = sym;
1414 sym_ptr.* = sym;1424 sym_ptr.* = sym;
1425 } else if (sym.cast(Symbol.Tentative)) |tent| {
1426 if (self.globals.get(sym.name)) |g_sym| {
1427 sym.alias = g_sym;
1428 continue;
1429 }
1430
1431 if (self.unresolved.fetchSwapRemove(sym.name)) |kv| {
1432 kv.value.alias = sym;
1433 }
1434
1435 const t_sym = self.tentatives.get(sym.name) orelse {
1436 // Put new tentative definition symbol into symbol table.
1437 try self.tentatives.putNoClobber(self.allocator, sym.name, sym);
1438 continue;
1439 };
1440
1441 // TODO compare by size and pick the largest.
1442 return error.TODOResolveTentatives;
1415 } else if (sym.cast(Symbol.Unresolved)) |und| {1443 } else if (sym.cast(Symbol.Unresolved)) |und| {
1416 if (self.globals.get(sym.name)) |g_sym| {1444 if (self.globals.get(sym.name)) |g_sym| {
1417 sym.alias = g_sym;1445 sym.alias = g_sym;
1418 continue;1446 continue;
1419 }1447 }
1448 if (self.tentatives.get(sym.name)) |t_sym| {
1449 sym.alias = t_sym;
1450 continue;
1451 }
1420 if (self.unresolved.get(sym.name)) |u_sym| {1452 if (self.unresolved.get(sym.name)) |u_sym| {
1421 sym.alias = u_sym;1453 sym.alias = u_sym;
1422 continue;1454 continue;