zig

commit d8b1ef9430e0e383769ffa0a43750515aaa32280 (tree)
parent ae08f9bfe9c2ab5488b375ffd949609016658450
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Wed,  8 Nov 2023 12:11:55 +0100

elf: adjust r_addend with offset of the original input section ref'd via STT_SECTION

Diffstat:
M
src/link/Elf/Atom.zig
 | 
16
+++++++++++-----

1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig
@@ -311,11 +311,17 @@ pub fn writeRelocs(self: Atom, elf_file: *Elf, out_relocs: *std.ArrayList(elf.El
             else => |r_type| r_type,
         };
         const r_offset = self.value + rel.r_offset;
-        const r_addend = rel.r_addend;
-        const r_sym = switch (target.type(elf_file)) {
-            elf.STT_SECTION => elf_file.sectionSymbolOutputSymtabIndex(target.outputShndx().?),
-            else => target.outputSymtabIndex(elf_file),
-        };
+        var r_addend = rel.r_addend;
+        var r_sym: u32 = 0;
+        switch (target.type(elf_file)) {
+            elf.STT_SECTION => {
+                r_addend += @intCast(target.value);
+                r_sym = elf_file.sectionSymbolOutputSymtabIndex(target.outputShndx().?);
+            },
+            else => {
+                r_sym = target.outputSymtabIndex(elf_file);
+            },
+        }
 
         relocs_log.debug("  {s}: [{x} => {d}({s})] + {x}", .{
             fmtRelocType(r_type),