From 4de3f9d8537fb32017265a2228f9799481db11a0 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Thu, 10 Oct 2019 09:25:39 +0200 Subject: [PATCH] Fix stack-probe symbol redefinition --- lib/std/special/compiler_rt.zig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index 88e3078d6a..0a09f616e9 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -238,7 +238,8 @@ comptime { if (is_mingw) { @export("_alloca", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage); @export("___chkstk_ms", @import("compiler_rt/stack_probe.zig").___chkstk_ms, strong_linkage); - } else { + } else if (!builtin.link_libc) { + // This symbols are otherwise exported by MSVCRT.lib @export("_chkstk", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage); @export("__chkstk", @import("compiler_rt/stack_probe.zig").__chkstk, strong_linkage); }