diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6796165f06..10885827fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -526,42 +526,54 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/zig/system/x86.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/tokenizer.zig"
     "${CMAKE_SOURCE_DIR}/src/Air.zig"
+    "${CMAKE_SOURCE_DIR}/src/Builtin.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation/Config.zig"
+    "${CMAKE_SOURCE_DIR}/src/DarwinPosixSpawn.zig"
+    "${CMAKE_SOURCE_DIR}/src/InternPool.zig"
     "${CMAKE_SOURCE_DIR}/src/Liveness.zig"
+    "${CMAKE_SOURCE_DIR}/src/Liveness/Verify.zig"
     "${CMAKE_SOURCE_DIR}/src/Module.zig"
     "${CMAKE_SOURCE_DIR}/src/Package.zig"
     "${CMAKE_SOURCE_DIR}/src/Package/Fetch.zig"
+    "${CMAKE_SOURCE_DIR}/src/Package/Fetch/git.zig"
+    "${CMAKE_SOURCE_DIR}/src/Package/Manifest.zig"
+    "${CMAKE_SOURCE_DIR}/src/Package/Module.zig"
     "${CMAKE_SOURCE_DIR}/src/RangeSet.zig"
     "${CMAKE_SOURCE_DIR}/src/Sema.zig"
+    "${CMAKE_SOURCE_DIR}/src/Sema/bitcast.zig"
+    "${CMAKE_SOURCE_DIR}/src/Sema/comptime_ptr_access.zig"
     "${CMAKE_SOURCE_DIR}/src/Value.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/Mir.zig"
-    "${CMAKE_SOURCE_DIR}/src/arch/aarch64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/aarch64/abi.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/aarch64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/arm/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/arm/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/arm/Mir.zig"
-    "${CMAKE_SOURCE_DIR}/src/arch/arm/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/arm/abi.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/arm/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/riscv64/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/riscv64/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/riscv64/Mir.zig"
-    "${CMAKE_SOURCE_DIR}/src/arch/riscv64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/riscv64/abi.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/riscv64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/sparc64/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/sparc64/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/sparc64/Mir.zig"
-    "${CMAKE_SOURCE_DIR}/src/arch/sparc64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/sparc64/abi.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/sparc64/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/wasm/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/wasm/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/wasm/Mir.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/wasm/abi.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/x86/bits.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/CodeGen.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/Disassembler.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/Emit.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/Encoding.zig"
+    "${CMAKE_SOURCE_DIR}/src/arch/x86_64/Lower.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/Mir.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/abi.zig"
     "${CMAKE_SOURCE_DIR}/src/arch/x86_64/bits.zig"
@@ -574,7 +586,17 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/codegen/c.zig"
     "${CMAKE_SOURCE_DIR}/src/codegen/c/Type.zig"
     "${CMAKE_SOURCE_DIR}/src/codegen/llvm.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/llvm/BitcodeReader.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/llvm/Builder.zig"
     "${CMAKE_SOURCE_DIR}/src/codegen/llvm/bindings.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/llvm/bitcode_writer.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/llvm/ir.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/spirv.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/spirv/Assembler.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/spirv/Module.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/spirv/Section.zig"
+    "${CMAKE_SOURCE_DIR}/src/codegen/spirv/spec.zig"
+    "${CMAKE_SOURCE_DIR}/src/crash_report.zig"
     "${CMAKE_SOURCE_DIR}/src/glibc.zig"
     "${CMAKE_SOURCE_DIR}/src/introspect.zig"
     "${CMAKE_SOURCE_DIR}/src/libcxx.zig"
@@ -586,7 +608,9 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/link/Coff/Atom.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Coff/ImportTable.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Coff/Object.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Coff/Relocation.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Coff/lld.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Dwarf.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/Archive.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/Atom.zig"
@@ -599,6 +623,7 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/link/Elf/eh_frame.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/file.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/gc.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Elf/merge_section.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/relocatable.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/relocation.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Elf/synthetic_sections.zig"
@@ -617,9 +642,9 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/link/MachO/UnwindInfo.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/ZigObject.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/dead_strip.zig"
-    "${CMAKE_SOURCE_DIR}/src/link/MachO/dyld_info/bind.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/dyld_info/Rebase.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/dyld_info/Trie.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/MachO/dyld_info/bind.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/eh_frame.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/fat.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/file.zig"
@@ -629,15 +654,32 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/link/MachO/synthetic.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/thunks.zig"
     "${CMAKE_SOURCE_DIR}/src/link/MachO/uuid.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/NvPtx.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Plan9.zig"
     "${CMAKE_SOURCE_DIR}/src/link/Plan9/aout.zig"
-    "${CMAKE_SOURCE_DIR}/src/link/Wasm.zig"
-    "${CMAKE_SOURCE_DIR}/src/link/msdos-stub.bin"
+    "${CMAKE_SOURCE_DIR}/src/link/SpirV.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/SpirV/BinaryModule.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/SpirV/deduplicate.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/SpirV/lower_invocation_globals.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/SpirV/prune_unused.zig"
     "${CMAKE_SOURCE_DIR}/src/link/StringTable.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/Archive.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/Atom.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/Object.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/Symbol.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/ZigObject.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/file.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/Wasm/types.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/aarch64.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/riscv.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/table_section.zig"
     "${CMAKE_SOURCE_DIR}/src/link/tapi.zig"
     "${CMAKE_SOURCE_DIR}/src/link/tapi/Tokenizer.zig"
     "${CMAKE_SOURCE_DIR}/src/link/tapi/parse.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/tapi/parse/test.zig"
     "${CMAKE_SOURCE_DIR}/src/link/tapi/yaml.zig"
+    "${CMAKE_SOURCE_DIR}/src/link/tapi/yaml/test.zig"
     "${CMAKE_SOURCE_DIR}/src/main.zig"
     "${CMAKE_SOURCE_DIR}/src/mingw.zig"
     "${CMAKE_SOURCE_DIR}/src/musl.zig"