Commit 0848d33d78

Andrew Kelley <andrew@ziglang.org>
2022-11-04 00:49:10
Merge pull request #13430 from ziglang/stack-probe-msvc
Miscellaneous arm64 windows fixes
1 parent d8970de
Changed files (2)
lib
compiler_rt
stack_probe.zig
src
libc_installation.zig
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) {
src/libc_installation.zig
@@ -411,6 +411,7 @@ pub const LibCInstallation = struct {
             .i386 => "x86",
             .x86_64 => "x64",
             .arm, .armeb => "arm",
+            .aarch64 => "arm64",
             else => return error.UnsupportedArchitecture,
         };
 
@@ -474,6 +475,7 @@ pub const LibCInstallation = struct {
             .i386 => "x86",
             .x86_64 => "x64",
             .arm, .armeb => "arm",
+            .aarch64 => "arm64",
             else => return error.UnsupportedArchitecture,
         };