| author |  Andrew Kelley <andrew@ziglang.org> 2022-11-03 19:49:10-04:00 |
| committer |  GitHub <noreply@github.com> 2022-11-03 19:49:10-04:00 |
| log | 42755a1944f4c4a60fc7e5e66cf76e9cbdf1ce84 |
| tree | 828ff79196fbf4074f8d6c841ff82fd39d295df7 |
| parent | b19161ba9c9bb754d22fccef3d6f444941369ed6 |
| parent | 34652038248ff209e4bee60bcd2d7299404b15fe |
| signature |  Signed by PGP key 4AEE18F83AFDEB23 |
Merge pull request #13430 from ziglang/stack-probe-msvc
Miscellaneous arm64 windows fixes2 files changed, 6 insertions(+), 4 deletions(-)
lib- compiler_rt
lib/compiler_rt/stack_probe.zig+4-4
| ... | @@ -18,15 +18,15 @@ comptime { | ... | @@ -18,15 +18,15 @@ comptime { |
| 18 | if (is_mingw) { | 18 | if (is_mingw) { |
| 19 | @export(_chkstk, .{ .name = "_alloca", .linkage = strong_linkage }); | 19 | @export(_chkstk, .{ .name = "_alloca", .linkage = strong_linkage }); |
| 20 | @export(___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = strong_linkage }); | 20 | @export(___chkstk_ms, .{ .name = "___chkstk_ms", .linkage = strong_linkage }); |
| 21 | |||
| 22 | if (arch.isAARCH64()) { | ||
| 23 | @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); | ||
| 24 | } | ||
| 21 | } else if (!builtin.link_libc) { | 25 | } else if (!builtin.link_libc) { |
| 22 | // This symbols are otherwise exported by MSVCRT.lib | 26 | // This symbols are otherwise exported by MSVCRT.lib |
| 23 | @export(_chkstk, .{ .name = "_chkstk", .linkage = strong_linkage }); | 27 | @export(_chkstk, .{ .name = "_chkstk", .linkage = strong_linkage }); |
| 24 | @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); | 28 | @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); |
| 25 | } | 29 | } |
| 26 | |||
| 27 | if (arch.isAARCH64()) { | ||
| 28 | @export(__chkstk, .{ .name = "__chkstk", .linkage = strong_linkage }); | ||
| 29 | } | ||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | switch (arch) { | 32 | switch (arch) { |
src/libc_installation.zig+2
| ... | @@ -411,6 +411,7 @@ pub const LibCInstallation = struct { | ... | @@ -411,6 +411,7 @@ pub const LibCInstallation = struct { |
| 411 | .i386 => "x86", | 411 | .i386 => "x86", |
| 412 | .x86_64 => "x64", | 412 | .x86_64 => "x64", |
| 413 | .arm, .armeb => "arm", | 413 | .arm, .armeb => "arm", |
| 414 | .aarch64 => "arm64", | ||
| 414 | else => return error.UnsupportedArchitecture, | 415 | else => return error.UnsupportedArchitecture, |
| 415 | }; | 416 | }; |
| 416 | 417 | ||
| ... | @@ -474,6 +475,7 @@ pub const LibCInstallation = struct { | ... | @@ -474,6 +475,7 @@ pub const LibCInstallation = struct { |
| 474 | .i386 => "x86", | 475 | .i386 => "x86", |
| 475 | .x86_64 => "x64", | 476 | .x86_64 => "x64", |
| 476 | .arm, .armeb => "arm", | 477 | .arm, .armeb => "arm", |
| 478 | .aarch64 => "arm64", | ||
| 477 | else => return error.UnsupportedArchitecture, | 479 | else => return error.UnsupportedArchitecture, |
| 478 | }; | 480 | }; |
| 479 | 481 |