From b3f40c35dc0bc4a09124918da3651bbae823b4a6 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Mon, 9 Oct 2023 23:58:46 +0200
Subject: [PATCH] elf: fix testTlsOffsetAlignment test

---
 test/link/elf.zig | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/link/elf.zig b/test/link/elf.zig
index 5efa57d0db..79249a11a1 100644
--- a/test/link/elf.zig
+++ b/test/link/elf.zig
@@ -93,8 +93,7 @@ pub fn build(b: *Build) void {
     elf_step.dependOn(testTlsLdNoPlt(b, .{ .target = glibc_target }));
     // https://github.com/ziglang/zig/issues/17430
     // elf_step.dependOn(testTlsNoPic(b, .{ .target = glibc_target }));
-    // TODO
-    // elf_step.dependOn(testTlsOffsetAlignment(b, .{ .target = glibc_target }));
+    elf_step.dependOn(testTlsOffsetAlignment(b, .{ .target = glibc_target }));
     elf_step.dependOn(testTlsPic(b, .{ .target = glibc_target }));
     elf_step.dependOn(testTlsSmallAlignment(b, .{ .target = glibc_target }));
     elf_step.dependOn(testWeakExports(b, .{ .target = glibc_target }));
@@ -2464,7 +2463,7 @@ fn testTlsOffsetAlignment(b: *Build, opts: Options) *Step {
         \\void *(*verify)(void *);
         \\
         \\int main() {
-        \\  void *handle = dlopen("a.so", RTLD_NOW);
+        \\  void *handle = dlopen("liba.so", RTLD_NOW);
         \\  assert(handle);
         \\  *(void**)(&verify) = dlsym(handle, "verify");
         \\  assert(verify);
@@ -2477,10 +2476,8 @@ fn testTlsOffsetAlignment(b: *Build, opts: Options) *Step {
         \\  pthread_join(thread, NULL);
         \\}
     , &.{});
-    exe.linkLibrary(dso);
+    exe.addRPath(dso.getEmittedBinDirectory());
     exe.linkLibC();
-    exe.linkSystemLibrary2("dl", .{});
-    exe.linkSystemLibrary2("pthread", .{});
     exe.force_pic = true;
 
     const run = addRunArtifact(exe);