zig

commit a8564df9ed510f572732b8179844299fc3d3c11b (tree)
parent 16c55b15cb227067bf8146226139608edddd8e8c
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Wed, 12 Jan 2022 23:28:33 +0100

zld: parse addend from BRANCH reloc on x86_64

As usual, MachO, full of surprises!

Diffstat:
M
src/link/MachO/Atom.zig
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig
@@ -419,6 +419,7 @@ pub fn parseRelocs(self: *Atom, relocs: []macho.relocation_info, context: RelocC
                     .X86_64_RELOC_BRANCH => {
                         // TODO rewrite relocation
                         try addStub(target, context);
+                        addend = mem.readIntLittle(i32, self.code.items[offset..][0..4]);
                     },
                     .X86_64_RELOC_GOT, .X86_64_RELOC_GOT_LOAD => {
                         // TODO rewrite relocation
@@ -1003,7 +1004,7 @@ pub fn resolveRelocs(self: *Atom, macho_file: *MachO) !void {
                     .X86_64_RELOC_BRANCH => {
                         const displacement = try math.cast(
                             i32,
-                            @intCast(i64, target_addr) - @intCast(i64, source_addr) - 4,
+                            @intCast(i64, target_addr) - @intCast(i64, source_addr) - 4 + rel.addend,
                         );
                         mem.writeIntLittle(u32, self.code.items[rel.offset..][0..4], @bitCast(u32, displacement));
                     },