Commit 5c482361034a0b1575ecb719724c942b5709b449 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-11-05 12:37:15+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-11-05 12:37:15+01:00
log	5c482361034a0b1575ecb719724c942b5709b449
tree	88b92023adfe7d8c80fb0af59247aee3f7f06d8a
parent	8d7ec05070ba5798adbeaf9a7153b6316fa6dcc3

elf: init objects after parsing them

3 files changed, 14 insertions(+), 15 deletions(-)

src
- link
  - Elf.zig
  - Elf
    Object.zig
    SharedObject.zig

src/link/Elf.zig+11-13

 @@ -1286,8 +1286,6 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
         try positionals.append(.{ .path = ssp.full_object_path });
     }
-    if (self.isStaticLib()) return self.flushStaticLib(comp, positionals.items);
     for (positionals.items) |obj| {
         var parse_ctx: ParseErrorCtx = .{ .detected_cpu_arch = undefined };
         self.parsePositional(obj.path, obj.must_link, &parse_ctx) catch |err|
 @@ -1393,6 +1391,16 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
             try self.handleAndReportParseError(obj.path, err, &parse_ctx);
     }
+    if (self.isStaticLib()) return self.flushStaticLib(comp);
+    // Init all objects
+    for (self.objects.items) |index| {
+        try self.file(index).?.object.init(self);
+    }
+    for (self.shared_objects.items) |index| {
+        try self.file(index).?.shared_object.init(self);
+    }
     // Dedup shared objects
     {
         var seen_dsos = std.StringHashMap(void).init(gpa);
 @@ -1522,18 +1530,8 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
     }
 }
-pub fn flushStaticLib(
+pub fn flushStaticLib(self: *Elf, comp: *Compilation) link.File.FlushError!void {
-    self: *Elf,
-    comp: *Compilation,
-    positionals: []const Compilation.LinkObject,
-) link.File.FlushError!void {
     _ = comp;
-    if (positionals.len > 0) {
-        var err = try self.addErrorWithNotes(1);
-        try err.addMsg(self, "fatal linker error: too many input positionals", .{});
-        try err.addNote(self, "TODO implement linking objects into an static library", .{});
-        return;
-    }
     const gpa = self.base.allocator;
     // First, we flush relocatable object file generated with our backends.

src/link/Elf/Object.zig+2

 @@ -96,7 +96,9 @@ pub fn parse(self: *Object, elf_file: *Elf) !void {
                 sym.st_name + strtab_bias;
         }
     }
+}
+pub fn init(self: *Object, elf_file: *Elf) !void {
     try self.initAtoms(elf_file);
     try self.initSymtab(elf_file);

src/link/Elf/SharedObject.zig+1-2

...	@@ -72,7 +72,6 @@ pub fn parse(self: SharedObject, elf_file: Elf) !void {	...	@@ -72,7 +72,6 @@ pub fn parse(self: SharedObject, elf_file: Elf) !void {
72	}	72	}
73		73
74	try self.parseVersions(elf_file);	74	try self.parseVersions(elf_file);
75	try self.initSymtab(elf_file);
76	}	75	}
77		76
78	fn parseVersions(self: SharedObject, elf_file: Elf) !void {	77	fn parseVersions(self: SharedObject, elf_file: Elf) !void {
...	@@ -120,7 +119,7 @@ fn parseVersions(self: SharedObject, elf_file: Elf) !void {	...	@@ -120,7 +119,7 @@ fn parseVersions(self: SharedObject, elf_file: Elf) !void {
120	}	119	}
121	}	120	}
122		121
123	fn initSymtab(self: SharedObject, elf_file: Elf) !void {	122	pub fn init(self: SharedObject, elf_file: Elf) !void {
124	const gpa = elf_file.base.allocator;	123	const gpa = elf_file.base.allocator;
125	const symtab = self.getSymtabRaw();	124	const symtab = self.getSymtabRaw();
126	const strtab = self.getStrtabRaw();	125	const strtab = self.getStrtabRaw();