aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2021-06-10 10:29:57 +0200
committerJakub Konka <kubkon@jakubkonka.com>2021-06-10 10:29:57 +0200
commit66ff56c58f3ef71f5cc3b8392632b3ec8abec43f (patch)
tree1fa2f35826f3ede01b2355d052951c50689798ee /src
parent96bb81b6ef0896d0b63c54bfd5d1ac0fa267d68a (diff)
downloadzig-66ff56c58f3ef71f5cc3b8392632b3ec8abec43f.tar.gz
zig-66ff56c58f3ef71f5cc3b8392632b3ec8abec43f.zip
zld: add Symbol.Tentative to denote common symbol
Diffstat (limited to 'src')
-rw-r--r--src/link/MachO/Object.zig16
-rw-r--r--src/link/MachO/Symbol.zig18
2 files changed, 31 insertions, 3 deletions
diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig
index 1277423b09..12ce918a36 100644
--- a/src/link/MachO/Object.zig
+++ b/src/link/MachO/Object.zig
@@ -388,9 +388,19 @@ pub fn parseSymbols(self: *Object) !void {
}
if (sym.n_value != 0) {
- const comm_size = sym.n_value;
- const comm_align = (sym.n_desc >> 8) & 0x0f;
- log.err("Common symbol {s} in {s}: size 0x{x}, align 0x{x}", .{ sym_name, self.name.?, comm_size, comm_align });
+ const tentative = try self.allocator.create(Symbol.Tentative);
+ errdefer self.allocator.destroy(tentative);
+ tentative.* = .{
+ .base = .{
+ .@"type" = .tentative,
+ .name = name,
+ },
+ .size = sym.n_value,
+ .alignment = (sym.n_desc >> 8) & 0x0f,
+ .file = self,
+ };
+
+ log.err("Common symbol {s} in {s}: {}", .{ sym_name, self.name.?, tentative });
return error.UnhandledSymbolType;
}
diff --git a/src/link/MachO/Symbol.zig b/src/link/MachO/Symbol.zig
index 46203b5d0d..632bba12e6 100644
--- a/src/link/MachO/Symbol.zig
+++ b/src/link/MachO/Symbol.zig
@@ -12,6 +12,7 @@ pub const Type = enum {
regular,
proxy,
unresolved,
+ tentative,
};
/// Symbol type.
@@ -94,6 +95,23 @@ pub const Unresolved = struct {
pub const base_type: Symbol.Type = .unresolved;
};
+pub const Tentative = struct {
+ base: Symbol,
+
+ /// Symbol size.
+ size: u64,
+
+ /// Symbol alignment as power of two.
+ alignment: u16,
+
+ /// File where this symbol was referenced.
+ file: *Object,
+
+ // TODO debug info?
+
+ pub const base_type: Symbol.Type = .tentative;
+};
+
pub fn deinit(base: *Symbol, allocator: *Allocator) void {
allocator.free(base.name);
}