diff --git a/lib/std/target.zig b/lib/std/target.zig
index c02efa2495d8a35e2a11fb5ac45205165ba3db90..5d7d91a229a2507bb4228e3541cebf8d45af13f3 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -1329,6 +1329,7 @@ pub const Target = struct {
                     .amdgcn => comptime allCpusFromDecls(amdgpu.cpu),
                     .riscv32, .riscv64 => comptime allCpusFromDecls(riscv.cpu),
                     .sparc, .sparc64, .sparcel => comptime allCpusFromDecls(sparc.cpu),
+                    .spirv32, .spirv64 => comptime allCpusFromDecls(spirv.cpu),
                     .s390x => comptime allCpusFromDecls(s390x.cpu),
                     .x86, .x86_64 => comptime allCpusFromDecls(x86.cpu),
                     .xtensa => comptime allCpusFromDecls(xtensa.cpu),
@@ -1392,6 +1393,7 @@ pub const Target = struct {
                     .amdgcn => &amdgpu.cpu.generic,
                     .riscv32 => &riscv.cpu.generic_rv32,
                     .riscv64 => &riscv.cpu.generic_rv64,
+                    .spirv32, .spirv64 => &spirv.cpu.generic,
                     .sparc, .sparcel => &sparc.cpu.generic,
                     .sparc64 => &sparc.cpu.v9, // 64-bit SPARC needs v9 as the baseline
                     .s390x => &s390x.cpu.generic,
diff --git a/lib/std/target/spirv.zig b/lib/std/target/spirv.zig
index 39a91c753739a5b9ad2bf017e84546d09e4c9161..b0f5a1946117e0320a1c52f76cee1039c9b07d17 100644
--- a/lib/std/target/spirv.zig
+++ b/lib/std/target/spirv.zig
@@ -2081,3 +2081,11 @@ pub const all_features = blk: {
     }
     break :blk result;
 };
+
+pub const cpu = struct {
+    pub const generic = CpuModel{
+        .name = "generic",
+        .llvm_name = "generic",
+        .features = featureSet(&[_]Feature{}),
+    };
+};