From 15ef251a153de7f4985c1a87bf7706dde0e27306 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 31 Dec 2021 23:41:05 +0800 Subject: [PATCH] Avoid duplicate TLS startup symbols --- lib/std/start.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/std/start.zig b/lib/std/start.zig index 1d06e1eaf6..29b254c0f9 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -324,7 +324,7 @@ fn _start() callconv(.Naked) noreturn { fn WinStartup() callconv(std.os.windows.WINAPI) noreturn { @setAlignStack(16); - if (!builtin.single_threaded) { + if (!builtin.single_threaded and !builtin.link_libc) { _ = @import("start_windows_tls.zig"); } @@ -335,7 +335,7 @@ fn WinStartup() callconv(std.os.windows.WINAPI) noreturn { fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn { @setAlignStack(16); - if (!builtin.single_threaded) { + if (!builtin.single_threaded and !builtin.link_libc) { _ = @import("start_windows_tls.zig"); }