authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-03 19:49:10-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-11-03 19:49:10-04:00
log42755a1944f4c4a60fc7e5e66cf76e9cbdf1ce84
tree828ff79196fbf4074f8d6c841ff82fd39d295df7
parentb19161ba9c9bb754d22fccef3d6f444941369ed6
parent34652038248ff209e4bee60bcd2d7299404b15fe
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #13430 from ziglang/stack-probe-msvc

Miscellaneous arm64 windows fixes

2 files changed, 6 insertions(+), 4 deletions(-)

lib/compiler_rt/stack_probe.zig+4-4
......@@ -18,15 +18,15 @@ comptime {
1818 if (is_mingw) {
1919 @export(_chkstk, .{ .name = "_alloca", .linkage = strong_linkage });
2020 @export(___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = strong_linkage });
21
22 if (arch.isAARCH64()) {
23 @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage });
24 }
2125 } else if (!builtin.link_libc) {
2226 // This symbols are otherwise exported by MSVCRT.lib
2327 @export(_chkstk, .{ .name = "_chkstk", .linkage = strong_linkage });
2428 @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage });
2529 }
26
27 if (arch.isAARCH64()) {
28 @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage });
29 }
3030 }
3131
3232 switch (arch) {
src/libc_installation.zig+2
......@@ -411,6 +411,7 @@ pub const LibCInstallation = struct {
411411 .i386 => "x86",
412412 .x86_64 => "x64",
413413 .arm, .armeb => "arm",
414 .aarch64 => "arm64",
414415 else => return error.UnsupportedArchitecture,
415416 };
416417
......@@ -474,6 +475,7 @@ pub const LibCInstallation = struct {
474475 .i386 => "x86",
475476 .x86_64 => "x64",
476477 .arm, .armeb => "arm",
478 .aarch64 => "arm64",
477479 else => return error.UnsupportedArchitecture,
478480 };
479481