zig

fork of https://codeberg.org/ziglang/zig
Log | Files | Refs | README | LICENSE

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

Avoid duplicate TLS startup symbols

Diffstat:
Mlib/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"); }