mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-06 21:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Miscellaneous arm64 windows fixes
This commit is contained in:
Andrew Kelley 2022-11-03 19:49:10 -04:00 committed by GitHub
commit 42755a1944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compiler_rt/stack_probe.zig
View File

@ -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) {

2
src/libc_installation.zig
View File

@ -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,
};