Commit 7258d143e355f6bd92797cdb193c2b1ad2a1650d | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2024-03-08 14:38:21+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2024-03-08 22:46:17+01:00
log	7258d143e355f6bd92797cdb193c2b1ad2a1650d
tree	650ad29890e808d52ac69f478cdd29e1e49037e0
parent	b5642b4f85e7962ee7eb3d137e47fadf392a865b

elf+aarch64: fix incorrectly emitted TLSDESC relocs

1 files changed, 13 insertions(+), 3 deletions(-)

src
- link
  - Elf
    synthetic_sections.zig

src/link/Elf/synthetic_sections.zig+13-3

 @@ -634,8 +634,17 @@ pub const GotSection = struct {
                     }
                 },
                 .tlsdesc => {
-                    try writeInt(0, elf_file, writer);
+                    if (symbol.?.flags.import) {
-                    try writeInt(0, elf_file, writer);
+                        try writeInt(0, elf_file, writer);
+                        try writeInt(0, elf_file, writer);
+                    } else {
+                        try writeInt(0, elf_file, writer);
+                        const offset = if (apply_relocs)
+                            @as(i64, @intCast(symbol.?.address(.{}, elf_file))) - @as(i64, @intCast(elf_file.tlsAddress()))
+                        else
+                            0;
+                        try writeInt(offset, elf_file, writer);
+                    }
                 },
             }
         }
 @@ -738,8 +747,9 @@ pub const GotSection = struct {
                     const offset = symbol.?.tlsDescAddress(elf_file);
                     elf_file.addRelaDynAssumeCapacity(.{
                         .offset = offset,
-                        .sym = extra.?.dynamic,
+                        .sym = if (symbol.?.flags.import) extra.?.dynamic else 0,
                         .type = relocation.encode(.tlsdesc, cpu_arch),
+                        .addend = if (symbol.?.flags.import) 0 else @intCast(symbol.?.address(.{}, elf_file) - elf_file.tlsAddress()),
                     });
                 },
             }