authorgravatar for prc.zhao@outlook.comSizhe Zhao <prc.zhao@outlook.com> 2021-12-31 23:41:05+08:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-01-24 20:26:29+02:00
log15ef251a153de7f4985c1a87bf7706dde0e27306
treee8fa669abedfdc3839d70798185ffbb8edd8fc67
parent3f341bdc26fdfb552809405a188d269244c1e9d3

Avoid duplicate TLS startup symbols

1 files changed, 2 insertions(+), 2 deletions(-)

lib/std/start.zig+2-2
...@@ -324,7 +324,7 @@ fn _start() callconv(.Naked) noreturn {...@@ -324,7 +324,7 @@ fn _start() callconv(.Naked) noreturn {
324324
325fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {325fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {
326 @setAlignStack(16);326 @setAlignStack(16);
327 if (!builtin.single_threaded) {327 if (!builtin.single_threaded and !builtin.link_libc) {
328 _ = @import("start_windows_tls.zig");328 _ = @import("start_windows_tls.zig");
329 }329 }
330330
...@@ -335,7 +335,7 @@ fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {...@@ -335,7 +335,7 @@ fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {
335335
336fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn {336fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn {
337 @setAlignStack(16);337 @setAlignStack(16);
338 if (!builtin.single_threaded) {338 if (!builtin.single_threaded and !builtin.link_libc) {
339 _ = @import("start_windows_tls.zig");339 _ = @import("start_windows_tls.zig");
340 }340 }
341341