motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #6829 from tadeokondrak/error-unsupported-callconv

Browse Source 
stage1: Compile error instead of falling back to C for unsupported cc
This commit is contained in:
Veikka Tuominen
2020-11-19 19:03:08 +02:00
committed by GitHub
parent 25ec2dbc1e 3a28b659bd
commit cf819b95fe
17 changed files with 380 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/start.zig
View File

@@ -53,7 +53,7 @@ fn _DllMainCRTStartup(
hinstDLL: std.os.windows.HINSTANCE,
fdwReason: std.os.windows.DWORD,
lpReserved: std.os.windows.LPVOID,
) callconv(.Stdcall) std.os.windows.BOOL {
) callconv(std.os.windows.WINAPI) std.os.windows.BOOL {
if (!builtin.single_threaded and !builtin.link_libc) {
_ = @import("start_windows_tls.zig");
}
@@ -162,7 +162,7 @@ fn _start() callconv(.Naked) noreturn {
@call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{});
}
fn WinStartup() callconv(.Stdcall) noreturn {
fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {
@setAlignStack(16);
if (!builtin.single_threaded) {
_ = @import("start_windows_tls.zig");
@@ -173,7 +173,7 @@ fn WinStartup() callconv(.Stdcall) noreturn {
std.os.windows.kernel32.ExitProcess(initEventLoopAndCallMain());
}
fn wWinMainCRTStartup() callconv(.Stdcall) noreturn {
fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn {
@setAlignStack(16);
if (!builtin.single_threaded) {
_ = @import("start_windows_tls.zig");