authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2025-10-14 02:36:07-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2025-10-29 18:41:05-04:00
log6e8b07ca1526d2faa1805f2831c862b6b2337d92
tree93309d815c789ff22447e3e329869762a8779385
parenta072d821be9e4bae68c7c14e9438f3750d2c0c89

Elf: fix alignment of merge subsections

Closes #25565

1 files changed, 4 insertions(+), 1 deletions(-)

src/link/Elf/Object.zig+4-1
......@@ -861,7 +861,10 @@ pub fn resolveMergeSubsections(self: *Object, elf_file: *Elf) error{
861861 for (imsec.strings.items, imsec.subsections.items) |str, *imsec_msub| {
862862 const string = imsec.bytes.items[str.pos..][0..str.len];
863863 const res = try msec.insert(gpa, string);
864 if (!res.found_existing) {
864 if (res.found_existing) {
865 const msub = msec.mergeSubsection(res.sub.*);
866 msub.alignment = msub.alignment.maxStrict(atom_ptr.alignment);
867 } else {
865868 const msub_index = try msec.addMergeSubsection(gpa);
866869 const msub = msec.mergeSubsection(msub_index);
867870 msub.merge_section_index = imsec.merge_section_index;