Commit a1a9d7440ca7b33a73ef7d3b4ee450271337f96f | zig

author	Jacob Young <jacobly@ziglang.org> 2024-08-30 09:01:30-04:00
committer	Jacob Young <jacobly@ziglang.org> 2024-08-30 09:24:32-04:00
log	a1a9d7440ca7b33a73ef7d3b4ee450271337f96f
tree	a5aae705179667dc378293c321faf8230649d481
parent	7305184203dd94fd48da69f8a468b3094b848533

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

src/link/Elf/eh_frame.zig+6-1

 @@ -490,11 +490,16 @@ pub fn writeEhFrameHdr(elf_file: *Elf, writer: anytype) !void {
     const eh_frame_shdr = shdrs[elf_file.eh_frame_section_index.?];
     const eh_frame_hdr_shdr = shdrs[elf_file.eh_frame_hdr_section_index.?];
     const num_fdes = @as(u32, @intCast(@divExact(eh_frame_hdr_shdr.sh_size - eh_frame_hdr_header_size, 8)));
+    const existing_size = existing_size: {
+        const zo = elf_file.zigObjectPtr() orelse break :existing_size 0;
+        const sym = zo.symbol(zo.eh_frame_index orelse break :existing_size 0);
+        break :existing_size sym.atom(elf_file).?.size;
+    };
     try writer.writeInt(
         u32,
         @as(u32, @bitCast(@as(
             i32,
-            @truncate(@as(i64, @intCast(eh_frame_shdr.sh_addr)) - @as(i64, @intCast(eh_frame_hdr_shdr.sh_addr)) - 4),
+            @truncate(@as(i64, @intCast(eh_frame_shdr.sh_addr + existing_size)) - @as(i64, @intCast(eh_frame_hdr_shdr.sh_addr)) - 4),
         ))),
         .little,
     );