diff options
| author | Sizhe Zhao <prc.zhao@outlook.com> | 2021-12-31 23:41:05 +0800 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2022-01-24 20:26:29 +0200 |
| commit | 15ef251a153de7f4985c1a87bf7706dde0e27306 (patch) | |
| tree | e8fa669abedfdc3839d70798185ffbb8edd8fc67 /lib/std/start.zig | |
| parent | 3f341bdc26fdfb552809405a188d269244c1e9d3 (diff) | |
| download | zig-15ef251a153de7f4985c1a87bf7706dde0e27306.tar.gz zig-15ef251a153de7f4985c1a87bf7706dde0e27306.zip | |
Avoid duplicate TLS startup symbols
Diffstat (limited to 'lib/std/start.zig')
| -rw-r--r-- | lib/std/start.zig | 4 |
1 files 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"); } |