authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-10-09 17:08:07+02:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-10-09 22:44:35+02:00
loga4b3e695af47a93788b265b0fc4a55d4dded1ef3
treef36147d6040af7cb1b2eb52108a68aa875c3eea2
parente0ab685467567f6da02be865654a2c4dc5f8c3a9

Shuffle around some stack-probing functions

1 files changed, 8 insertions(+), 6 deletions(-)

lib/std/special/compiler_rt.zig+8-6
...@@ -234,14 +234,16 @@ comptime {...@@ -234,14 +234,16 @@ comptime {
234 @export("__aeabi_dcmpun", @import("compiler_rt/comparedf2.zig").__unorddf2, linkage);234 @export("__aeabi_dcmpun", @import("compiler_rt/comparedf2.zig").__unorddf2, linkage);
235 }235 }
236 if (builtin.os == .windows) {236 if (builtin.os == .windows) {
237 if (!builtin.link_libc) {237 // Default stack-probe functions emitted by LLVM
238 if (is_mingw) {
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);
241 } else {
238 @export("_chkstk", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);242 @export("_chkstk", @import("compiler_rt/stack_probe.zig")._chkstk, strong_linkage);
239 @export("__chkstk", @import("compiler_rt/stack_probe.zig").__chkstk, strong_linkage);243 @export("__chkstk", @import("compiler_rt/stack_probe.zig").__chkstk, strong_linkage);
240 @export("___chkstk", @import("compiler_rt/stack_probe.zig").___chkstk, strong_linkage);244 }
241 @export("__chkstk_ms", @import("compiler_rt/stack_probe.zig").__chkstk_ms, strong_linkage);245
242 @export("___chkstk_ms", @import("compiler_rt/stack_probe.zig").___chkstk_ms, strong_linkage);246 if (is_mingw) {
243 } else if (is_mingw) {
244 @export("___chkstk_ms", @import("compiler_rt/stack_probe.zig").___chkstk_ms, strong_linkage);
245 @export("__stack_chk_fail", __stack_chk_fail, strong_linkage);247 @export("__stack_chk_fail", __stack_chk_fail, strong_linkage);
246 @export("__stack_chk_guard", __stack_chk_guard, strong_linkage);248 @export("__stack_chk_guard", __stack_chk_guard, strong_linkage);
247 }249 }