zig

commit 15ef251a153de7f4985c1a87bf7706dde0e27306 (tree)
parent 3f341bdc26fdfb552809405a188d269244c1e9d3
Author: Sizhe Zhao <prc.zhao@outlook.com>
Date:   Fri, 31 Dec 2021 23:41:05 +0800

Avoid duplicate TLS startup symbols

Diffstat:
M
lib/std/start.zig
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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");
     }