diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-11-03 19:49:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-03 19:49:10 -0400 |
| commit | 42755a1944f4c4a60fc7e5e66cf76e9cbdf1ce84 (patch) | |
| tree | 828ff79196fbf4074f8d6c841ff82fd39d295df7 | |
| parent | b19161ba9c9bb754d22fccef3d6f444941369ed6 (diff) | |
| parent | 34652038248ff209e4bee60bcd2d7299404b15fe (diff) | |
| download | zig-42755a1944f4c4a60fc7e5e66cf76e9cbdf1ce84.tar.gz zig-42755a1944f4c4a60fc7e5e66cf76e9cbdf1ce84.zip | |
Merge pull request #13430 from ziglang/stack-probe-msvc
Miscellaneous arm64 windows fixes
| -rw-r--r-- | lib/compiler_rt/stack_probe.zig | 8 | ||||
| -rw-r--r-- | src/libc_installation.zig | 2 |
2 files changed, 6 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) { diff --git a/src/libc_installation.zig b/src/libc_installation.zig index f9f6b37fba..58910ba12f 100644 --- a/src/libc_installation.zig +++ b/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, }; |