diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp
index 34cad0f464..21338f5807 100644
--- a/src/stage1/analyze.cpp
+++ b/src/stage1/analyze.cpp
@@ -971,9 +971,9 @@ const char *calling_convention_name(CallingConvention cc) {
         case CallingConventionFastcall: return "Fastcall";
         case CallingConventionVectorcall: return "Vectorcall";
         case CallingConventionThiscall: return "Thiscall";
-        case CallingConventionAPCS: return "Apcs";
-        case CallingConventionAAPCS: return "Aapcs";
-        case CallingConventionAAPCSVFP: return "Aapcsvfp";
+        case CallingConventionAPCS: return "APCS";
+        case CallingConventionAAPCS: return "AAPCS";
+        case CallingConventionAAPCSVFP: return "AAPCSVFP";
     }
     zig_unreachable();
 }
@@ -2066,7 +2066,7 @@ static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_sc
         fn_entry->align_bytes = fn_type_id.alignment;
     }
 
-    if ((err = emit_error_unless_callconv_allowed_for_target(g, proto_node, cc)))
+    if ((err = emit_error_unless_callconv_allowed_for_target(g, proto_node->data.fn_proto.callconv_expr, cc)))
         return g->builtin_types.entry_invalid;
 
     if (fn_proto->return_anytype_token != nullptr) {
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index 48775c3bcb..0d429ab914 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -57,6 +57,84 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
         "tmp.zig:1:22: note: type u2 cannot fit values in range 0...4",
     });
 
+    cases.addCase(x: {
+        var tc = cases.create("callconv(.Interrupt) on unsupported platform",
+            \\export fn entry() callconv(.Interrupt) void {}
+        , &[_][]const u8{
+            "tmp.zig:1:28: error: callconv 'Interrupt' is only available on x86, x86_64, AVR, and MSP430, not aarch64",
+        });
+        tc.target = std.zig.CrossTarget{
+            .cpu_arch = .aarch64,
+            .os_tag = .linux,
+            .abi = .none,
+        };
+        break :x tc;
+    });
+
+    cases.addCase(x: {
+        var tc = cases.create("callconv(.Signal) on unsupported platform",
+            \\export fn entry() callconv(.Signal) void {}
+        , &[_][]const u8{
+            "tmp.zig:1:28: error: callconv 'Signal' is only available on AVR, not x86_64",
+        });
+        tc.target = std.zig.CrossTarget{
+            .cpu_arch = .x86_64,
+            .os_tag = .linux,
+            .abi = .none,
+        };
+        break :x tc;
+    });
+
+    cases.addCase(x: {
+        var tc = cases.create("callconv(.Stdcall, .Fastcall, .Thiscall) on unsupported platform",
+            \\export fn entry1() callconv(.Stdcall) void {}
+            \\export fn entry2() callconv(.Fastcall) void {}
+            \\export fn entry3() callconv(.Thiscall) void {}
+        , &[_][]const u8{
+            "tmp.zig:1:29: error: callconv 'Stdcall' is only available on x86, not x86_64",
+            "tmp.zig:2:29: error: callconv 'Fastcall' is only available on x86, not x86_64",
+            "tmp.zig:3:29: error: callconv 'Thiscall' is only available on x86, not x86_64",
+        });
+        tc.target = std.zig.CrossTarget{
+            .cpu_arch = .x86_64,
+            .os_tag = .linux,
+            .abi = .none,
+        };
+        break :x tc;
+    });
+
+    cases.addCase(x: {
+        var tc = cases.create("callconv(.Vectorcall) on unsupported platform",
+            \\export fn entry() callconv(.Vectorcall) void {}
+        , &[_][]const u8{
+            "tmp.zig:1:28: error: callconv 'Vectorcall' is only available on x86 and AArch64, not x86_64",
+        });
+        tc.target = std.zig.CrossTarget{
+            .cpu_arch = .x86_64,
+            .os_tag = .linux,
+            .abi = .none,
+        };
+        break :x tc;
+    });
+
+    cases.addCase(x: {
+        var tc = cases.create("callconv(.APCS, .AAPCS, .AAPCSVFP) on unsupported platform",
+            \\export fn entry1() callconv(.APCS) void {}
+            \\export fn entry2() callconv(.AAPCS) void {}
+            \\export fn entry3() callconv(.AAPCSVFP) void {}
+        , &[_][]const u8{
+            "tmp.zig:1:29: error: callconv 'APCS' is only available on ARM, not x86_64",
+            "tmp.zig:2:29: error: callconv 'AAPCS' is only available on ARM, not x86_64",
+            "tmp.zig:3:29: error: callconv 'AAPCSVFP' is only available on ARM, not x86_64",
+        });
+        tc.target = std.zig.CrossTarget{
+            .cpu_arch = .x86_64,
+            .os_tag = .linux,
+            .abi = .none,
+        };
+        break :x tc;
+    });
+
     cases.add("unreachable executed at comptime",
         \\fn foo(comptime x: i32) i32 {
         \\    comptime {