Commit d3b1c903dddee56b0f2ab06a00848b1b0017f062 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-10-15 21:29:48+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-10-16 19:33:06+02:00
log	d3b1c903dddee56b0f2ab06a00848b1b0017f062
tree	4da9ca356cc4d511b9c14770b19d2e3ee04e090d
parent	5192a2fbbe0222ada60d9abccbadf5e8a2d50684

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

src/link/Elf.zig+15-3

 @@ -3927,13 +3927,25 @@ fn initSpecialPhdrs(self: *Elf) !void {
         .@"align" = 1,
     });
-    const has_tls = for (self.shdrs.items) |shdr| {
+    const has_tls = has_tls: {
-        if (shdr.sh_flags & elf.SHF_TLS != 0) break true;
+        if (self.base.options.link_libc and self.isStatic()) {
-    } else false;
+            // Even if we don't emit any TLS data, linking against musl-libc without
+            // empty TLS phdr leads to a bizarre segfault in `__copy_tls` function.
+            // So far I haven't been able to work out why that is, but adding an empty
+            // TLS phdr seems to fix it, so let's go with it for now.
+            // TODO try to investigate more
+            break :has_tls true;
+        }
+        for (self.shdrs.items) |shdr| {
+            if (shdr.sh_flags & elf.SHF_TLS != 0) break :has_tls true;
+        }
+        break :has_tls false;
+    };
     if (has_tls) {
         self.phdr_tls_index = try self.addPhdr(.{
             .type = elf.PT_TLS,
             .flags = elf.PF_R,
+            .@"align" = 1,
         });
     }
 }