Commit 1cdcac604f5408f06689c6c9866aef355d1b2f72 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2026-10-23 02:11:17+01:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2026-10-25 00:21:55+01:00
log	1cdcac604f5408f06689c6c9866aef355d1b2f72
tree	6a83d6d7afa8cbc9d4bdafc75f90a431378910a6
parent	d74e9a786f96af052065c0d3a6c22ab38e9b697f
signature	Commit is signed but in an unrecognized format.

1 files changed, 9 insertions(+), 5 deletions(-)

src/link/Elf2.zig+9-5

 @@ -8100,11 +8100,15 @@ fn loadObject(
                     if (opts.node_fixed) ni: {
                         const shndx_ni = opts.shndx.node(elf);
                         const after_oni: MappedFile.Node.Index.Optional = after: {
-                            const last_ni = shndx_ni.last(&elf.mf).unwrap() orelse break :after .none;
+                            var node_it = shndx_ni.last(&elf.mf);
-                            break :after switch (last_ni.position(&elf.mf)) {
+                            while (node_it.unwrap()) |cur_ni| {
-                                .header => .wrap(last_ni),
+                                switch (cur_ni.position(&elf.mf)) {
-                                .footer, .floating => .none,
+                                    .header => break :after .wrap(cur_ni), // last header
-                            };
+                                    .footer, .floating => node_it = cur_ni.prev(&elf.mf),
+                                }
+                            } else {
+                                break :after .none;
+                            }
                         };
                         break :ni try shndx_ni.addHeaderChildAfter(gpa, &elf.mf, after_oni, add_node_opts);
                     } else try opts.shndx.node(elf).addFloatingChild(gpa, &elf.mf, add_node_opts),