mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Elf: fix alignment of merge subsections

Browse Source 
Closes #25565
This commit is contained in:
Jacob Young 2025-10-14 02:36:07 -04:00 committed by Jacob Young
parent a072d821be
commit 6e8b07ca15
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/link/Elf/Object.zig
View File

@ -861,7 +861,10 @@ pub fn resolveMergeSubsections(self: *Object, elf_file: *Elf) error{
for (imsec.strings.items, imsec.subsections.items) |str, *imsec_msub| {
const string = imsec.bytes.items[str.pos..][0..str.len];
const res = try msec.insert(gpa, string);
if (!res.found_existing) {
if (res.found_existing) {
const msub = msec.mergeSubsection(res.sub.*);
msub.alignment = msub.alignment.maxStrict(atom_ptr.alignment);
} else {
const msub_index = try msec.addMergeSubsection(gpa);
const msub = msec.mergeSubsection(msub_index);
msub.merge_section_index = imsec.merge_section_index;