authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-10-10 09:25:39+02:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-10-10 09:38:57+02:00
log4de3f9d8537fb32017265a2228f9799481db11a0
tree9eb7df9ba40876028cb7bdfd5110d8f5be636734
parentdfcbca8d2fed33c1fbd47b0b4e98ed0c214fa7e6

Fix stack-probe symbol redefinition

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

lib/std/special/compiler_rt.zig+2-1
...@@ -238,7 +238,8 @@ comptime {...@@ -238,7 +238,8 @@ comptime {
238 if (is_mingw) {238 if (is_mingw) {
239 @export("_alloca", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);239 @export("_alloca", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);
240 @export("___chkstk_ms", @import("compiler_rt/stack_probe.zig").___chkstk_ms, strong_linkage);240 @export("___chkstk_ms", @import("compiler_rt/stack_probe.zig").___chkstk_ms, strong_linkage);
241 } else {241 } else if (!builtin.link_libc) {
242 // This symbols are otherwise exported by MSVCRT.lib
242 @export("_chkstk", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);243 @export("_chkstk", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);
243 @export("__chkstk", @import("compiler_rt/stack_probe.zig").__chkstk, strong_linkage);244 @export("__chkstk", @import("compiler_rt/stack_probe.zig").__chkstk, strong_linkage);
244 }245 }