diff --git a/src/clang_options.zon b/src/clang_options.zon
index 2984aadbb3..15b49f8210 100644
--- a/src/clang_options.zon
+++ b/src/clang_options.zon
@@ -273,6 +273,9 @@
 .{ .name = "utf-8", .psl = true },
 .{ .name = "validate-charset", .psl = true },
 .{ .name = "validate-charset-", .psl = true },
+.{ .name = "vlen", .psl = true },
+.{ .name = "vlen=256", .psl = true },
+.{ .name = "vlen=512", .psl = true },
 .{ .name = "vmb", .psl = true },
 .{ .name = "vmg", .psl = true },
 .{ .name = "vmm", .psl = true },
@@ -692,9 +695,9 @@
 .{ .name = "fnew-alignment", .syntax = .separate },
 .{ .name = "faligned-new" },
 .{ .name = "fno-aligned-new" },
-.{ .name = "fsched-interblock" },
 .{ .name = "fcuda-rdc" },
 .{ .name = "fno-cuda-rdc" },
+.{ .name = "fsched-interblock" },
 .{ .name = "ftree-vectorize" },
 .{ .name = "fno-tree-vectorize" },
 .{ .name = "ftree-slp-vectorize" },
@@ -723,6 +726,8 @@
 .{ .name = "mtune=help", .ze = .mcpu },
 .{ .name = "integrated-as" },
 .{ .name = "no-integrated-as" },
+.{ .name = "shared-libasan" },
+.{ .name = "static-libasan" },
 .{ .name = "fopenmp-is-device" },
 .{ .name = "fcuda-approx-transcendentals" },
 .{ .name = "fno-cuda-approx-transcendentals" },
@@ -760,14 +765,12 @@
 .{ .name = "Oy-", .psl = true },
 .{ .name = "Qgather-", .psl = true },
 .{ .name = "Qscatter-", .psl = true },
-.{ .name = "shared-libasan" },
 .{ .name = "Xmicrosoft-visualc-tools-root", .syntax = .separate },
 .{ .name = "Xmicrosoft-visualc-tools-version", .syntax = .separate },
 .{ .name = "Xmicrosoft-windows-sdk-root", .syntax = .separate },
 .{ .name = "Xmicrosoft-windows-sdk-version", .syntax = .separate },
 .{ .name = "Xmicrosoft-windows-sys-root", .syntax = .separate },
 .{ .name = "Qembed_debug", .psl = true },
-.{ .name = "static-libasan" },
 .{ .name = "fslp-vectorize-aggressive" },
 .{ .name = "fident" },
 .{ .name = "fno-ident" },
@@ -787,13 +790,13 @@
 .{ .name = "fno-sanitize-blacklist" },
 .{ .name = "fhonor-infinites" },
 .{ .name = "fno-honor-infinites" },
-.{ .name = "findirect-virtual-calls" },
 .{
     .name = "config",
     .syntax = .separate,
     .pd1 = false,
     .pd2 = true,
 },
+.{ .name = "findirect-virtual-calls" },
 .{ .name = "ansi", .pd2 = true },
 .{ .name = "arch", .syntax = .separate },
 .{ .name = "arch_errors_fatal" },
@@ -900,6 +903,7 @@
 .{ .name = "dead_strip" },
 .{ .name = "debug-forward-template-params" },
 .{ .name = "debug-info-macro" },
+.{ .name = "debug-info-macro-expansion-loc" },
 .{ .name = "default-function-attr", .syntax = .separate },
 .{
     .name = "defsym",
@@ -934,14 +938,19 @@
 .{ .name = "dwarf-debug-producer", .syntax = .separate },
 .{ .name = "dwarf-explicit-import" },
 .{ .name = "dwarf-ext-refs" },
+.{ .name = "all-resources-bound", .psl = true },
+.{ .name = "Zpc", .psl = true },
 .{ .name = "Vd", .psl = true },
 .{ .name = "Gis", .psl = true },
 .{ .name = "hlsl-no-stdinc", .psl = true },
+.{ .name = "rootsig-define", .syntax = .separate },
 .{
     .name = "force-rootsig-ver",
     .syntax = .separate,
     .psl = true,
 },
+.{ .name = "Zpr", .psl = true },
+.{ .name = "Qstrip-rootsignature", .psl = true },
 .{ .name = "dylib_file", .syntax = .separate },
 .{ .name = "dylinker" },
 .{ .name = "dynamic", .ze = .dynamic },
@@ -1089,6 +1098,7 @@
 .{ .name = "fcheck-array-temporaries" },
 .{ .name = "fcheck-new" },
 .{ .name = "fclangir" },
+.{ .name = "fcoarray" },
 .{ .name = "fcodegen-data-generate" },
 .{ .name = "fcodegen-data-use" },
 .{ .name = "fcolor-diagnostics", .ze = .color_diagnostics },
@@ -1148,8 +1158,11 @@
 .{ .name = "fdeclspec" },
 .{ .name = "fdefault-double-8" },
 .{ .name = "fdefault-inline" },
+.{ .name = "fdefault-integer-4" },
 .{ .name = "fdefault-integer-8" },
+.{ .name = "fdefault-real-4" },
 .{ .name = "fdefault-real-8" },
+.{ .name = "fdefer-ts" },
 .{ .name = "fdefine-target-os-macros" },
 .{ .name = "fdelayed-template-parsing" },
 .{ .name = "fdelete-null-pointer-checks" },
@@ -1205,9 +1218,11 @@
 .{ .name = "ferror-limit", .syntax = .separate },
 .{ .name = "fescaping-block-tail-calls" },
 .{ .name = "fexceptions" },
+.{ .name = "fexperimental-call-graph-section" },
 .{ .name = "fexperimental-isel" },
 .{ .name = "fexperimental-late-parse-attributes" },
 .{ .name = "fexperimental-library" },
+.{ .name = "fexperimental-loop-fusion" },
 .{ .name = "fexperimental-new-constant-interpreter" },
 .{ .name = "fexperimental-omit-vtable-rtti" },
 .{ .name = "fexperimental-relative-c++-abi-vtables" },
@@ -1221,6 +1236,7 @@
 .{ .name = "ff2c" },
 .{ .name = "ffake-address-space-map" },
 .{ .name = "ffast-math" },
+.{ .name = "ffast-real-mod" },
 .{ .name = "ffat-lto-objects" },
 .{ .name = "ffile-reproducible" },
 .{ .name = "fimplicit-modules-use-lock" },
@@ -1345,6 +1361,8 @@
 .{ .name = "fhip-fp32-correctly-rounded-divide-sqrt" },
 .{ .name = "fhip-kernel-arg-name" },
 .{ .name = "fhip-new-launch-api" },
+.{ .name = "fspv-enable-maximal-reconvergence" },
+.{ .name = "fspv-use-unknown-image-format" },
 .{ .name = "fhlsl-strict-availability" },
 .{ .name = "fhonor-infinities" },
 .{ .name = "fhonor-nans" },
@@ -1393,6 +1411,7 @@
 .{ .name = "flat_namespace" },
 .{ .name = "flax-vector-conversions" },
 .{ .name = "fexperimental-lifetime-safety" },
+.{ .name = "fexperimental-lifetime-safety-inference" },
 .{ .name = "flimit-debug-info" },
 .{ .name = "flogical-abbreviations" },
 .{ .name = "floop-interchange" },
@@ -1428,7 +1447,9 @@
 .{ .name = "fmodules-force-validate-user-headers" },
 .{ .name = "fmodules-hash-content" },
 .{ .name = "fmodules-local-submodule-visibility" },
+.{ .name = "fmodules-reduced-bmi" },
 .{ .name = "fmodules-search-all" },
+.{ .name = "fmodules-single-module-parse-mode" },
 .{ .name = "fmodules-skip-diagnostic-options" },
 .{ .name = "fmodules-skip-header-search-paths" },
 .{ .name = "fmodules-strict-context-hash" },
@@ -1448,8 +1469,10 @@
 .{ .name = "fms-volatile" },
 .{ .name = "fmudflap" },
 .{ .name = "fmudflapth" },
+.{ .name = "fnamed-loops" },
 .{ .name = "fnative-half-arguments-and-returns" },
 .{ .name = "fnative-half-type" },
+.{ .name = "fnative-int16-type" },
 .{ .name = "fnested-functions" },
 .{ .name = "fnew-infallible" },
 .{ .name = "fnext-runtime" },
@@ -1539,6 +1562,7 @@
 .{ .name = "fno-debug-types-section" },
 .{ .name = "fno-declspec" },
 .{ .name = "fno-default-inline" },
+.{ .name = "fno-defer-ts" },
 .{ .name = "fno-define-target-os-macros" },
 .{ .name = "fno-delayed-template-parsing" },
 .{ .name = "fno-delete-null-pointer-checks" },
@@ -1573,14 +1597,17 @@
 .{ .name = "fno-emulated-tls" },
 .{ .name = "fno-escaping-block-tail-calls" },
 .{ .name = "fno-exceptions" },
+.{ .name = "fno-experimental-call-graph-section" },
 .{ .name = "fno-experimental-isel" },
 .{ .name = "fno-experimental-late-parse-attributes" },
 .{ .name = "fno-experimental-library" },
+.{ .name = "fno-experimental-loop-fusion" },
 .{ .name = "fno-experimental-omit-vtable-rtti" },
 .{ .name = "fno-experimental-relative-c++-abi-vtables" },
 .{ .name = "fno-external-blas" },
 .{ .name = "fno-f2c" },
 .{ .name = "fno-fast-math" },
+.{ .name = "fno-fast-real-mod" },
 .{ .name = "fno-fat-lto-objects" },
 .{ .name = "fno-file-reproducible" },
 .{ .name = "fno-implicit-modules-use-lock" },
@@ -1646,6 +1673,7 @@
 .{ .name = "fno-knr-functions" },
 .{ .name = "fno-lax-vector-conversions" },
 .{ .name = "fno-experimental-lifetime-safety" },
+.{ .name = "fno-experimental-lifetime-safety-inference" },
 .{ .name = "fno-limit-debug-info" },
 .{ .name = "fno-logical-abbreviations" },
 .{ .name = "fno-loop-interchange" },
@@ -1671,6 +1699,7 @@
 .{ .name = "fno-modules-force-validate-user-headers" },
 .{ .name = "fno-modules-global-index" },
 .{ .name = "fno-modules-prune-non-affecting-module-map-files" },
+.{ .name = "fno-modules-reduced-bmi" },
 .{ .name = "fno-modules-search-all" },
 .{ .name = "fno-modules-share-filemanager" },
 .{ .name = "fno-modules-skip-diagnostic-options" },
@@ -1685,12 +1714,14 @@
 .{ .name = "fno-ms-extensions" },
 .{ .name = "fno-ms-tls-guards" },
 .{ .name = "fno-ms-volatile" },
+.{ .name = "fno-named-loops" },
 .{ .name = "fno-new-infallible" },
 .{ .name = "fno-non-call-exceptions" },
 .{ .name = "fno-objc-arc" },
 .{ .name = "fno-objc-arc-exceptions" },
 .{ .name = "fno-objc-avoid-heapify-local-blocks" },
 .{ .name = "fno-objc-convert-messages-to-runtime-calls" },
+.{ .name = "fno-objc-direct-precondition-thunk" },
 .{ .name = "fno-objc-encode-cxx-class-template-spec" },
 .{ .name = "fno-objc-exceptions" },
 .{ .name = "fno-objc-infer-related-result-type" },
@@ -1718,6 +1749,7 @@
 .{ .name = "fno-pack-derived" },
 .{ .name = "fno-pack-struct" },
 .{ .name = "fno-padding-on-unsigned-fixed-point" },
+.{ .name = "fno-partition-static-data-sections" },
 .{ .name = "fno-pascal-strings" },
 .{ .name = "fno-pch-codegen" },
 .{ .name = "fno-pch-debuginfo" },
@@ -1802,9 +1834,13 @@
 .{ .name = "fno-sanitize-address-poison-custom-array-cookie" },
 .{ .name = "fno-sanitize-address-use-after-scope" },
 .{ .name = "fno-sanitize-address-use-odr-indicator" },
+.{ .name = "fno-sanitize-alloc-token-extended" },
+.{ .name = "fno-sanitize-alloc-token-fast-abi" },
 .{ .name = "fno-sanitize-annotate-debug-info" },
 .{ .name = "fno-sanitize-cfi-canonical-jump-tables" },
 .{ .name = "fno-sanitize-cfi-cross-dso" },
+.{ .name = "fno-sanitize-debug-trap-reasons" },
+.{ .name = "fno-sanitize-handler-preserve-all-regs" },
 .{ .name = "fno-sanitize-hwaddress-experimental-aliasing" },
 .{ .name = "fno-sanitize-ignorelist" },
 .{ .name = "fno-sanitize-link-c++-runtime" },
@@ -1821,6 +1857,7 @@
 .{ .name = "fno-sanitize-thread-func-entry-exit" },
 .{ .name = "fno-sanitize-thread-memory-access" },
 .{ .name = "fno-sanitize-trap", .ze = .no_sanitize_trap },
+.{ .name = "fno-sanitize-type-outline-instrumentation" },
 .{ .name = "fno-sanitize-undefined-trap-on-error" },
 .{ .name = "fno-save-main-program" },
 .{ .name = "fno-save-optimization-record" },
@@ -1887,6 +1924,7 @@
 .{ .name = "fno-unique-source-file-names" },
 .{ .name = "fno-unroll-all-loops" },
 .{ .name = "fno-unroll-loops" },
+.{ .name = "fno-unsafe-cray-pointers" },
 .{ .name = "fno-unsafe-loop-optimizations" },
 .{ .name = "fno-unsafe-math-optimizations" },
 .{ .name = "fno-unsigned" },
@@ -1938,6 +1976,7 @@
 .{ .name = "fobjc-avoid-heapify-local-blocks" },
 .{ .name = "fobjc-call-cxx-cdtors" },
 .{ .name = "fobjc-convert-messages-to-runtime-calls" },
+.{ .name = "fobjc-direct-precondition-thunk" },
 .{ .name = "fobjc-disable-direct-methods-for-testing" },
 .{ .name = "fobjc-encode-cxx-class-template-spec" },
 .{ .name = "fobjc-exceptions" },
@@ -1987,6 +2026,7 @@
 .{ .name = "fpack-struct" },
 .{ .name = "fpadding-on-unsigned-fixed-point" },
 .{ .name = "fparse-all-comments" },
+.{ .name = "fpartition-static-data-sections" },
 .{ .name = "fpascal-strings" },
 .{ .name = "fpass-by-value-is-noalias" },
 .{ .name = "fpcc-struct-return" },
@@ -2081,6 +2121,8 @@
 .{ .name = "fsanitize-address-poison-custom-array-cookie" },
 .{ .name = "fsanitize-address-use-after-scope" },
 .{ .name = "fsanitize-address-use-odr-indicator" },
+.{ .name = "fsanitize-alloc-token-extended" },
+.{ .name = "fsanitize-alloc-token-fast-abi" },
 .{ .name = "fsanitize-annotate-debug-info" },
 .{ .name = "fsanitize-cfi-canonical-jump-tables" },
 .{ .name = "fsanitize-cfi-cross-dso" },
@@ -2102,6 +2144,8 @@
 .{ .name = "fsanitize-coverage-trace-pc" },
 .{ .name = "fsanitize-coverage-trace-pc-guard", .ze = .san_cov_trace_pc_guard },
 .{ .name = "fsanitize-coverage-trace-stores" },
+.{ .name = "fsanitize-debug-trap-reasons" },
+.{ .name = "fsanitize-handler-preserve-all-regs" },
 .{ .name = "fsanitize-hwaddress-experimental-aliasing" },
 .{ .name = "fsanitize-kcfi-arity" },
 .{ .name = "fsanitize-link-c++-runtime" },
@@ -2118,6 +2162,7 @@
 .{ .name = "fsanitize-thread-func-entry-exit" },
 .{ .name = "fsanitize-thread-memory-access" },
 .{ .name = "fsanitize-trap", .ze = .sanitize_trap },
+.{ .name = "fsanitize-type-outline-instrumentation" },
 .{ .name = "fsanitize-undefined-trap-on-error" },
 .{ .name = "fsave-main-program" },
 .{ .name = "fsave-optimization-record" },
@@ -2205,6 +2250,7 @@
 .{ .name = "funknown-anytype" },
 .{ .name = "funroll-all-loops" },
 .{ .name = "funroll-loops" },
+.{ .name = "funsafe-cray-pointers" },
 .{ .name = "funsafe-loop-optimizations" },
 .{ .name = "funsafe-math-optimizations" },
 .{ .name = "funsigned" },
@@ -2259,6 +2305,7 @@
 .{ .name = "g2" },
 .{ .name = "g3" },
 .{ .name = "g", .ze = .debug },
+.{ .name = "gcall-site-info" },
 .{ .name = "gcodeview" },
 .{ .name = "gcodeview-command-line" },
 .{ .name = "gcodeview-ghash" },
@@ -2271,6 +2318,7 @@
 .{ .name = "gdwarf-3", .ze = .debug },
 .{ .name = "gdwarf-4", .ze = .debug },
 .{ .name = "gdwarf-5", .ze = .debug },
+.{ .name = "gdwarf-6" },
 .{ .name = "gdwarf-aranges" },
 .{ .name = "gembed-source" },
 .{ .name = "gen-cdb-fragment-path", .syntax = .separate },
@@ -2289,6 +2337,7 @@
 .{ .name = "glldb" },
 .{ .name = "gmlt" },
 .{ .name = "gmodules" },
+.{ .name = "gno-call-site-info" },
 .{ .name = "gno-codeview-command-line" },
 .{ .name = "gno-codeview-ghash" },
 .{ .name = "gno-column-info" },
@@ -2303,6 +2352,7 @@
 .{ .name = "gno-simple-template-names" },
 .{ .name = "gno-split-dwarf" },
 .{ .name = "gno-strict-dwarf" },
+.{ .name = "gno-structor-decl-linkage-names" },
 .{ .name = "gno-template-alias" },
 .{ .name = "gomit-unreferenced-methods" },
 .{
@@ -2319,9 +2369,15 @@
 .{ .name = "gpulibc" },
 .{ .name = "grecord-command-line" },
 .{ .name = "gsce" },
+.{
+    .name = "gsframe",
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "gsimple-template-names" },
 .{ .name = "gsplit-dwarf" },
 .{ .name = "gstrict-dwarf" },
+.{ .name = "gstructor-decl-linkage-names" },
 .{ .name = "gtemplate-alias" },
 .{ .name = "gtoggle" },
 .{ .name = "gused" },
@@ -2347,6 +2403,7 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{ .name = "hlsl-all-resources-bound", .psl = true },
 .{ .name = "ibuiltininc" },
 .{ .name = "ignore-pch" },
 .{ .name = "image_base", .syntax = .separate },
@@ -2397,6 +2454,7 @@
 .{ .name = "maix-struct-return" },
 .{ .name = "malign-double" },
 .{ .name = "maltivec", .ze = .m },
+.{ .name = "mamdgpu-expand-waitcnt-profiling" },
 .{ .name = "mamdgpu-ieee" },
 .{ .name = "mamdgpu-precise-memory-op" },
 .{ .name = "mamx-avx512", .ze = .m },
@@ -2408,7 +2466,6 @@
 .{ .name = "mamx-movrs", .ze = .m },
 .{ .name = "mamx-tf32", .ze = .m },
 .{ .name = "mamx-tile", .ze = .m },
-.{ .name = "mamx-transpose", .ze = .m },
 .{ .name = "mannotate-tablejump" },
 .{ .name = "mapx-inline-asm-use-gpr32" },
 .{ .name = "mapxf" },
@@ -2418,11 +2475,7 @@
 .{ .name = "matomics", .ze = .m },
 .{ .name = "mavx", .ze = .m },
 .{ .name = "mavx10.1" },
-.{ .name = "mavx10.1-256" },
-.{ .name = "mavx10.1-512", .ze = .m },
 .{ .name = "mavx10.2" },
-.{ .name = "mavx10.2-256" },
-.{ .name = "mavx10.2-512", .ze = .m },
 .{ .name = "mavx2", .ze = .m },
 .{ .name = "mavx512bf16", .ze = .m },
 .{ .name = "mavx512bitalg", .ze = .m },
@@ -2485,7 +2538,6 @@
 .{ .name = "menable-no-nans" },
 .{ .name = "menqcmd", .ze = .m },
 .{ .name = "metal", .psl = true },
-.{ .name = "mevex512", .ze = .m },
 .{ .name = "mexception-handling", .ze = .m },
 .{ .name = "mexecute-only", .ze = .m },
 .{ .name = "mextended-const", .ze = .m },
@@ -2517,6 +2569,7 @@
 .{ .name = "mfsgsbase", .ze = .m },
 .{ .name = "mfsmuld" },
 .{ .name = "mfxsr", .ze = .m },
+.{ .name = "mgc" },
 .{ .name = "mgeneral-regs-only" },
 .{ .name = "mgfni", .ze = .m },
 .{ .name = "mginv", .ze = .m },
@@ -2614,6 +2667,7 @@
 .{ .name = "mno-adx", .ze = .m },
 .{ .name = "mno-aes", .ze = .m },
 .{ .name = "mno-altivec", .ze = .m },
+.{ .name = "mno-amdgpu-expand-waitcnt-profiling" },
 .{ .name = "mno-amdgpu-ieee" },
 .{ .name = "mno-amdgpu-precise-memory-op" },
 .{ .name = "mno-amx-avx512", .ze = .m },
@@ -2625,14 +2679,11 @@
 .{ .name = "mno-amx-movrs", .ze = .m },
 .{ .name = "mno-amx-tf32", .ze = .m },
 .{ .name = "mno-amx-tile", .ze = .m },
-.{ .name = "mno-amx-transpose", .ze = .m },
 .{ .name = "mno-annotate-tablejump" },
 .{ .name = "mno-apxf" },
 .{ .name = "mno-atomics", .ze = .m },
 .{ .name = "mno-avx", .ze = .m },
 .{ .name = "mno-avx10.1" },
-.{ .name = "mno-avx10.1-256" },
-.{ .name = "mno-avx10.1-512", .ze = .m },
 .{ .name = "mno-avx10.2" },
 .{ .name = "mno-avx2", .ze = .m },
 .{ .name = "mno-avx512bf16", .ze = .m },
@@ -2682,7 +2733,6 @@
 .{ .name = "mno-dspr2", .ze = .m },
 .{ .name = "mno-embedded-data" },
 .{ .name = "mno-enqcmd", .ze = .m },
-.{ .name = "mno-evex512", .ze = .m },
 .{ .name = "mno-exception-handling", .ze = .m },
 .{ .name = "mnoexecstack" },
 .{ .name = "mno-execute-only", .ze = .m },
@@ -2707,6 +2757,7 @@
 .{ .name = "mno-fsmuld", .ze = .m },
 .{ .name = "mno-fxsr", .ze = .m },
 .{ .name = "mno-gather" },
+.{ .name = "mno-gc" },
 .{ .name = "mno-gfni", .ze = .m },
 .{ .name = "mno-ginv", .ze = .m },
 .{ .name = "mno-global-merge" },
@@ -2798,6 +2849,7 @@
 .{ .name = "mno-relax-all" },
 .{ .name = "mno-relax-pic-calls" },
 .{ .name = "mno-relaxed-simd", .ze = .m },
+.{ .name = "mno-reserve-frame-pointer-reg" },
 .{ .name = "mno-restrict-it" },
 .{ .name = "mno-retpoline", .ze = .m },
 .{ .name = "mno-retpoline-external-thunk", .ze = .m },
@@ -2886,7 +2938,6 @@
 .{ .name = "module-file-deps" },
 .{ .name = "module-file-info" },
 .{ .name = "module-suffix", .syntax = .separate },
-.{ .name = "fmodules-reduced-bmi" },
 .{ .name = "momit-leaf-frame-pointer" },
 .{ .name = "moutline" },
 .{ .name = "moutline-atomics", .ze = .m },
@@ -2931,6 +2982,7 @@
 .{ .name = "mrelax-relocations=no" },
 .{ .name = "mrelaxed-simd", .ze = .m },
 .{ .name = "mrelocation-model", .syntax = .separate },
+.{ .name = "mreserve-frame-pointer-reg" },
 .{ .name = "mrestrict-it" },
 .{ .name = "mretpoline", .ze = .m },
 .{ .name = "mretpoline-external-thunk", .ze = .m },
@@ -3007,6 +3059,7 @@
 .{ .name = "mv73", .ze = .m },
 .{ .name = "mv75", .ze = .m },
 .{ .name = "mv79", .ze = .m },
+.{ .name = "mv81" },
 .{ .name = "mv8plus", .ze = .m },
 .{ .name = "mvaes", .ze = .m },
 .{ .name = "mvector-strict-align" },
@@ -3101,6 +3154,7 @@
 .{ .name = "no-pthread" },
 .{ .name = "no-round-trip-args" },
 .{ .name = "no-struct-path-tbaa" },
+.{ .name = "no-use-spirv-backend" },
 .{
     .name = "no-wasm-opt",
     .pd1 = false,
@@ -3311,6 +3365,7 @@
 .{ .name = "static-openmp" },
 .{ .name = "static-pie" },
 .{ .name = "stats-file-append" },
+.{ .name = "stats-file-timers" },
 .{ .name = "stdlib" },
 .{
     .name = "sycl-link",
@@ -3368,6 +3423,7 @@
 .{ .name = "Wrealloc-lhs-all", .pd2 = true },
 .{ .name = "Wfrontend-loop-interchange", .pd2 = true },
 .{ .name = "Wtarget-lifetime", .pd2 = true },
+.{ .name = "use-spirv-backend" },
 .{ .name = "v", .ze = .verbose },
 .{ .name = "vectorize-loops" },
 .{ .name = "vectorize-slp" },
@@ -3469,6 +3525,7 @@
 .{ .name = "fobjc-nonfragile-abi-version=", .syntax = .joined },
 .{ .name = "fprofile-instrument-use-path=", .syntax = .joined },
 .{ .name = "fsanitize-coverage-allowlist=", .syntax = .joined },
+.{ .name = "fsanitize-debug-trap-reasons=", .syntax = .joined },
 .{ .name = "fxray-instrumentation-bundle=", .syntax = .joined },
 .{ .name = "fsanitize-address-destructor=", .syntax = .joined },
 .{
@@ -3567,6 +3624,8 @@
 .{ .name = "analyzer-disable-checker=", .syntax = .joined },
 .{ .name = "fbuild-session-timestamp=", .syntax = .joined },
 .{ .name = "fdo-concurrent-to-openmp=", .syntax = .joined },
+.{ .name = "fdx-rootsignature-define=", .syntax = .joined },
+.{ .name = "fms-layout-compatibility=", .syntax = .joined },
 .{ .name = "fprofile-function-groups=", .syntax = .joined },
 .{ .name = "fprofile-instrument-path=", .syntax = .joined },
 .{ .name = "header-include-filtering=", .syntax = .joined },
@@ -3589,11 +3648,13 @@
 .{ .name = "dump-minimization-hints=", .syntax = .joined },
 .{ .name = "fapinotes-swift-version=", .syntax = .joined },
 .{ .name = "fcomment-block-commands=", .syntax = .comma_joined },
+.{ .name = "fintrinsic-modules-path=", .syntax = .joined },
 .{ .name = "flax-vector-conversions=", .syntax = .joined },
 .{ .name = "fmodules-embed-all-files", .syntax = .joined },
 .{ .name = "fmodules-prune-interval=", .syntax = .joined },
 .{ .name = "foverride-record-layout=", .syntax = .joined },
 .{ .name = "fprofile-instr-generate=", .syntax = .joined },
+.{ .name = "fprofile-instrument-use=", .syntax = .joined },
 .{ .name = "fprofile-remapping-file=", .syntax = .joined },
 .{ .name = "fsanitize-coverage-type=", .syntax = .joined },
 .{ .name = "fsanitize-hwaddress-abi=", .syntax = .joined },
@@ -3619,6 +3680,7 @@
 .{ .name = "fdebug-compilation-dir=", .syntax = .joined },
 .{ .name = "fdebug-default-version=", .syntax = .joined },
 .{ .name = "ffp-exception-behavior=", .syntax = .joined },
+.{ .name = "finitial-counter-value=", .syntax = .joined },
 .{ .name = "fmacro-backtrace-limit=", .syntax = .joined },
 .{ .name = "fmax-array-constructor=", .syntax = .joined },
 .{ .name = "fmcdc-max-test-vectors=", .syntax = .joined },
@@ -3640,6 +3702,7 @@
 .{ .name = "ffile-compilation-dir=", .syntax = .joined },
 .{ .name = "fgpu-inline-threshold=", .syntax = .joined },
 .{ .name = "finline-max-stacksize=", .syntax = .joined },
+.{ .name = "fmatrix-memory-layout=", .syntax = .joined },
 .{ .name = "fmax-subrecord-length=", .syntax = .joined },
 .{ .name = "fmodules-ignore-macro=", .syntax = .joined },
 .{
@@ -3732,6 +3795,7 @@
 .{ .name = "fms-omit-default-lib", .syntax = .joined },
 .{ .name = "fprofile-instrument=", .syntax = .joined },
 .{ .name = "fprofile-sample-use=", .syntax = .joined },
+.{ .name = "fsanitize-kcfi-hash=", .syntax = .joined },
 .{ .name = "fstrict-flex-arrays=", .syntax = .joined },
 .{
     .name = "hipstdpar-prim-path=",
@@ -3817,6 +3881,7 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{ .name = "falloc-token-mode=", .syntax = .joined },
 .{ .name = "fbinutils-version=", .syntax = .joined },
 .{ .name = "fclang-abi-compat=", .syntax = .joined },
 .{ .name = "fcodegen-data-use=", .syntax = .joined },
@@ -3865,6 +3930,7 @@
     .pd2 = true,
 },
 .{ .name = "falign-functions=", .syntax = .joined },
+.{ .name = "falloc-token-max=", .syntax = .joined },
 .{ .name = "fconstexpr-depth=", .syntax = .joined },
 .{ .name = "fconstexpr-steps=", .syntax = .joined },
 .{ .name = "ffile-prefix-map=", .syntax = .joined },
@@ -3951,7 +4017,7 @@
 .{ .name = "mzos-hlq-csslib=", .syntax = .joined },
 .{
     .name = "no-offload-arch=",
-    .syntax = .joined,
+    .syntax = .comma_joined,
     .pd1 = false,
     .pd2 = true,
 },
@@ -4296,6 +4362,12 @@
 .{ .name = "inline-asm=", .syntax = .joined },
 .{ .name = "ivfsoverlay", .syntax = .joined_or_separate },
 .{ .name = "iwithprefix", .syntax = .joined_or_separate },
+.{
+    .name = "libclc-lib=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "mfloat-abi=", .syntax = .joined },
 .{ .name = "plugin-arg-", .syntax = .joined_and_separate },
 .{
@@ -4457,7 +4529,6 @@
     .pd1 = false,
     .pd2 = true,
 },
-.{ .name = "fcoarray=", .syntax = .joined },
 .{ .name = "fconvert=", .syntax = .joined },
 .{ .name = "fc++-abi=", .syntax = .joined },
 .{ .name = "fextdirs=", .syntax = .joined },
@@ -4782,6 +4853,11 @@
     .syntax = .joined,
     .psl = true,
 },
+.{
+    .name = "Frs",
+    .syntax = .joined_or_separate,
+    .psl = true,
+},
 .{ .name = "gz=", .syntax = .joined },
 .{ .name = "A-", .syntax = .joined },
 .{ .name = "G=", .syntax = .joined },
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 49b8e72f58..af42e362a7 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -675,7 +675,7 @@ pub fn main(init: std.process.Init) !void {
     const child_args = [_][]const u8{
         llvm_tblgen_exe,
         "--dump-json",
-        try std.fmt.allocPrint(arena, "{s}/clang/include/clang/Driver/Options.td", .{llvm_src_root}),
+        try std.fmt.allocPrint(arena, "{s}/clang/include/clang/Options/Options.td", .{llvm_src_root}),
         try std.fmt.allocPrint(arena, "-I={s}/llvm/include", .{llvm_src_root}),
         try std.fmt.allocPrint(arena, "-I={s}/clang/include/clang/Driver", .{llvm_src_root}),
     };