Commit 5cdad186fe1cb83c6d79642433bfbe330436914a | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2024-09-03 14:45:59+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2024-09-04 13:34:26+02:00
log	5cdad186fe1cb83c6d79642433bfbe330436914a
tree	1faa27605eff1543d40902ec53d64c4e3674c7fb
parent	88e0d49febf5839654e4a5f3dc02ad6b2a82e242

elf: do not create .eh_frame section if ZigObject already did so in relocatable mode

1 files changed, 18 insertions(+), 11 deletions(-)

src
- link
  - Elf
    relocatable.zig

src/link/Elf/relocatable.zig+18-11

 @@ -302,21 +302,28 @@ fn initSections(elf_file: *Elf) !void {
         try msec.initOutputSection(elf_file);
     }
-    const needs_eh_frame = for (elf_file.objects.items) |index| {
+    const needs_eh_frame = if (elf_file.zigObjectPtr()) |zo|
+        zo.eh_frame_index != null
+    else for (elf_file.objects.items) |index| {
         if (elf_file.file(index).?.object.cies.items.len > 0) break true;
     } else false;
     if (needs_eh_frame) {
         if (elf_file.eh_frame_section_index == null) {
-            elf_file.eh_frame_section_index = try elf_file.addSection(.{
+            elf_file.eh_frame_section_index = blk: {
-                .name = try elf_file.insertShString(".eh_frame"),
+                if (elf_file.zigObjectPtr()) |zo| {
-                .type = if (elf_file.getTarget().cpu.arch == .x86_64)
+                    if (zo.eh_frame_index) |idx| break :blk zo.symbol(idx).atom(elf_file).?.output_section_index;
-                    elf.SHT_X86_64_UNWIND
+                }
-                else
+                break :blk try elf_file.addSection(.{
-                    elf.SHT_PROGBITS,
+                    .name = try elf_file.insertShString(".eh_frame"),
-                .flags = elf.SHF_ALLOC,
+                    .type = if (elf_file.getTarget().cpu.arch == .x86_64)
-                .addralign = elf_file.ptrWidthBytes(),
+                        elf.SHT_X86_64_UNWIND
-                .offset = std.math.maxInt(u64),
+                    else
-            });
+                        elf.SHT_PROGBITS,
+                    .flags = elf.SHF_ALLOC,
+                    .addralign = elf_file.ptrWidthBytes(),
+                    .offset = std.math.maxInt(u64),
+                });
+            };
         }
         elf_file.eh_frame_rela_section_index = try elf_file.addRelaShdr(
             try elf_file.insertShString(".rela.eh_frame"),