From 480c3c4d0a61d13fea9b90f575a836d2ec1c1c29 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Thu, 3 Nov 2022 14:41:28 +0100 Subject: [PATCH] compiler_rt: fix duplicate symbol error when linking libc on arm64 Windows --- lib/compiler_rt/stack_probe.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/compiler_rt/stack_probe.zig b/lib/compiler_rt/stack_probe.zig index 5ebb851825..22f0f936ce 100644 --- a/lib/compiler_rt/stack_probe.zig +++ b/lib/compiler_rt/stack_probe.zig @@ -18,15 +18,15 @@ comptime { if (is_mingw) { @export(_chkstk, .{ .name = "_alloca", .linkage = strong_linkage }); @export(___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = strong_linkage }); + + if (arch.isAARCH64()) { + @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); + } } else if (!builtin.link_libc) { // This symbols are otherwise exported by MSVCRT.lib @export(_chkstk, .{ .name = "_chkstk", .linkage = strong_linkage }); @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); } - - if (arch.isAARCH64()) { - @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); - } } switch (arch) {