authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-04-16 18:36:03+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-04-20 23:36:41+02:00
log65492b3d5276d7a57f696fdc4da4d47f36909715
tree8ce4c78f636ef6fdfe91a69a600ce9c8d302c929
parent9e0bca73e2ae8c29873c7280f28ce58502e6abab

link/elf: skip empty merge sections when resolving

3 files changed, 8 insertions(+), 3 deletions(-)

src/link/Elf.zig+1-1
......@@ -3341,7 +3341,7 @@ pub fn addCommentString(self: *Elf) !void {
33413341 res.sub.* = msub_index;
33423342}
33433343
3344fn resolveMergeSections(self: *Elf) !void {
3344pub fn resolveMergeSections(self: *Elf) !void {
33453345 const tracy = trace(@src());
33463346 defer tracy.end();
33473347
src/link/Elf/Object.zig+4
......@@ -283,6 +283,7 @@ fn initOutputSection(self: Object, elf_file: *Elf, shdr: elf.Elf64_Shdr) error{O
283283 const name = blk: {
284284 const name = self.getString(shdr.sh_name);
285285 if (elf_file.base.isRelocatable()) break :blk name;
286 if (shdr.sh_flags & elf.SHF_MERGE != 0) break :blk name;
286287 const sh_name_prefixes: []const [:0]const u8 = &.{
287288 ".text", ".data.rel.ro", ".data", ".rodata", ".bss.rel.ro", ".bss",
288289 ".init_array", ".fini_array", ".tbss", ".tdata", ".gcc_except_table", ".ctors",
......@@ -740,6 +741,7 @@ pub fn resolveMergeSubsections(self: *Object, elf_file: *Elf) !void {
740741
741742 for (self.merge_sections.items) |index| {
742743 const imsec = elf_file.inputMergeSection(index) orelse continue;
744 if (imsec.offsets.items.len == 0) continue;
743745 const msec = elf_file.mergeSection(imsec.merge_section_index);
744746 const atom_ptr = elf_file.atom(imsec.atom_index).?;
745747 const isec = atom_ptr.inputShdr(elf_file);
......@@ -773,6 +775,7 @@ pub fn resolveMergeSubsections(self: *Object, elf_file: *Elf) !void {
773775
774776 const imsec_index = self.merge_sections.items[esym.st_shndx];
775777 const imsec = elf_file.inputMergeSection(imsec_index) orelse continue;
778 if (imsec.offsets.items.len == 0) continue;
776779 const msub_index, const offset = imsec.findSubsection(@intCast(esym.st_value)) orelse {
777780 var err = try elf_file.addErrorWithNotes(2);
778781 try err.addMsg(elf_file, "invalid symbol value: {x}", .{esym.st_value});
......@@ -797,6 +800,7 @@ pub fn resolveMergeSubsections(self: *Object, elf_file: *Elf) !void {
797800
798801 const imsec_index = self.merge_sections.items[esym.st_shndx];
799802 const imsec = elf_file.inputMergeSection(imsec_index) orelse continue;
803 if (imsec.offsets.items.len == 0) continue;
800804 const msub_index, const offset = imsec.findSubsection(@intCast(@as(i64, @intCast(esym.st_value)) + rel.r_addend)) orelse {
801805 var err = try elf_file.addErrorWithNotes(1);
802806 try err.addMsg(elf_file, "invalid relocation at offset 0x{x}", .{rel.r_offset});
src/link/Elf/relocatable.zig+3-2
......@@ -179,10 +179,11 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const
179179 // input Object files.
180180 elf_file.resolveSymbols();
181181 elf_file.markEhFrameAtomsDead();
182 claimUnresolved(elf_file);
183
182 try elf_file.resolveMergeSections();
184183 try elf_file.addCommentString();
185184 try elf_file.sortMergeSections();
185 claimUnresolved(elf_file);
186
186187 try initSections(elf_file);
187188 try elf_file.sortShdrs();
188189 if (elf_file.zigObjectPtr()) |zig_object| {