From 21f1e76efeb2a1c1c9df32628b81713f9876d5ab Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Fri, 26 Apr 2024 12:44:20 -0700
Subject: [PATCH] zig cc: update clang CLI data to LLVM 18

release/18.x branch, commit 78b99c73ee4b96fe9ce0e294d4632326afb2db42
---
 src/clang_options_data.zig     | 301 ++++++++++++++++++++++++++++-----
 tools/update_clang_options.zig |   7 +-
 2 files changed, 268 insertions(+), 40 deletions(-)

diff --git a/src/clang_options_data.zig b/src/clang_options_data.zig
index 0d5bab676c..466013d0c6 100644
--- a/src/clang_options_data.zig
+++ b/src/clang_options_data.zig
@@ -460,6 +460,14 @@ sepd1("Zlinker-input"),
     .pd2 = false,
     .psl = true,
 },
+.{
+    .name = "Gregcall4",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = true,
+},
 .{
     .name = "Gv",
     .syntax = .flag,
@@ -2129,6 +2137,11 @@ flagpd1("analyzer-viz-egraph-graphviz"),
 flagpd1("analyzer-werror"),
 flagpd1("fslp-vectorize-aggressive"),
 flagpd1("fno-slp-vectorize-aggressive"),
+sepd1("fnew-alignment"),
+flagpd1("faligned-new"),
+flagpd1("fno-aligned-new"),
+flagpd1("fcuda-rdc"),
+flagpd1("fno-cuda-rdc"),
 flagpd1("fsched-interblock"),
 flagpd1("ftree-vectorize"),
 flagpd1("fno-tree-vectorize"),
@@ -2167,8 +2180,10 @@ flagpd1("mcpu=help"),
 flagpd1("mtune=help"),
 flagpd1("integrated-as"),
 flagpd1("no-integrated-as"),
-flagpd1("shared-libasan"),
 flagpd1("fopenmp-is-device"),
+flagpd1("shared-libasan"),
+flagpd1("fcuda-approx-transcendentals"),
+flagpd1("fno-cuda-approx-transcendentals"),
 .{
     .name = "Gs",
     .syntax = .flag,
@@ -2309,12 +2324,20 @@ sepd1("Xmicrosoft-visualc-tools-root"),
 sepd1("Xmicrosoft-visualc-tools-version"),
 sepd1("Xmicrosoft-windows-sdk-root"),
 sepd1("Xmicrosoft-windows-sdk-version"),
+.{
+    .name = "Qembed_debug",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = true,
+},
+flagpd1("fident"),
+flagpd1("fno-ident"),
 flagpd1("fdiagnostics-color"),
 flagpd1("fno-diagnostics-color"),
 flagpd1("frecord-gcc-switches"),
 flagpd1("fno-record-gcc-switches"),
-flagpd1("fident"),
-flagpd1("fno-ident"),
 flagpd1("Xparser"),
 flagpd1("Xcompiler"),
 flagpd1("fexpensive-optimizations"),
@@ -2323,6 +2346,7 @@ flagpd1("fdefer-pop"),
 flagpd1("fno-defer-pop"),
 flagpd1("fextended-identifiers"),
 flagpd1("fno-extended-identifiers"),
+flagpd1("fno-sanitize-blacklist"),
 .{
     .name = "config",
     .syntax = .separate,
@@ -2331,15 +2355,9 @@ flagpd1("fno-extended-identifiers"),
     .pd2 = true,
     .psl = false,
 },
-flagpd1("fno-sanitize-blacklist"),
 flagpd1("fhonor-infinites"),
 flagpd1("fno-honor-infinites"),
 flagpd1("findirect-virtual-calls"),
-flagpd1("fcuda-rdc"),
-flagpd1("fno-cuda-rdc"),
-sepd1("fnew-alignment"),
-flagpd1("faligned-new"),
-flagpd1("fno-aligned-new"),
 .{
     .name = "ansi",
     .syntax = .flag,
@@ -2380,7 +2398,6 @@ sepd1("bundle_loader"),
 },
 sepd1("c-isystem"),
 flagpd1("canonical-prefixes"),
-flagpd1("canonical-system-headers"),
 flagpd1("cc1"),
 flagpd1("cc1as"),
 flagpd1("ccc-arcmt-check"),
@@ -2438,8 +2455,6 @@ flagpd1("compiler-options-dump"),
     .pd2 = true,
     .psl = false,
 },
-sepd1("coverage-data-file"),
-sepd1("coverage-notes-file"),
 flagpd1("cpp"),
 flagpd1("cpp-precomp"),
 .{
@@ -2548,6 +2563,14 @@ flagpd1("dynamic"),
     .pd2 = false,
     .psl = false,
 },
+.{
+    .name = "e",
+    .syntax = .separate,
+    .zig_equivalent = .entry,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 flagpd1("ehcontguard"),
 flagpd1("emit-ast"),
 flagpd1("emit-codegen-only"),
@@ -2598,7 +2621,7 @@ flagpd1("emit-pch"),
     .psl = true,
 },
 flagpd1("enable-noundef-analysis"),
-flagpd1("enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang"),
+flagpd1("enable-tlsdesc"),
 .{
     .name = "end-no-unused-arguments",
     .syntax = .flag,
@@ -2646,9 +2669,12 @@ flagpd1("fallow-unsupported"),
 flagpd1("falternative-parameter-statement"),
 flagpd1("faltivec"),
 flagpd1("fanalyzed-objects-for-unparse"),
+flagpd1("fandroid-pad-segment"),
 flagpd1("fkeep-inline-functions"),
 flagpd1("funit-at-a-time"),
 flagpd1("fansi-escape-codes"),
+flagpd1("fapinotes"),
+flagpd1("fapinotes-modules"),
 flagpd1("fapple-kext"),
 flagpd1("fapple-link-rtlib"),
 flagpd1("fapple-pragma-pack"),
@@ -2658,6 +2684,7 @@ flagpd1("fapprox-func"),
 flagpd1("fasm"),
 flagpd1("fasm-blocks"),
 flagpd1("fassociative-math"),
+flagpd1("fassume-nothrow-exception-dtor"),
 flagpd1("fassume-sane-operator-new"),
 flagpd1("fassume-unique-vtables"),
 flagpd1("fast"),
@@ -2665,6 +2692,7 @@ flagpd1("fastcp"),
 flagpd1("fastf"),
 flagpd1("fasync-exceptions"),
 flagpd1("fasynchronous-unwind-tables"),
+flagpd1("fauto-import"),
 flagpd1("fauto-profile"),
 flagpd1("fauto-profile-accurate"),
 flagpd1("fautolink"),
@@ -2685,6 +2713,7 @@ flagpd1("fbranch-count-reg"),
     .pd2 = false,
     .psl = false,
 },
+flagpd1("fbuiltin-headers-in-system-modules"),
 flagpd1("fbuiltin-module-map"),
 flagpd1("fcall-saved-x10"),
 flagpd1("fcall-saved-x11"),
@@ -2740,7 +2769,6 @@ flagpd1("fcreate-profile"),
 flagpd1("fcs-profile-generate"),
 flagpd1("fctor-dtor-return-this"),
 flagpd1("fcuda-allow-variadic-functions"),
-flagpd1("fcuda-approx-transcendentals"),
 flagpd1("fcuda-flush-denormals-to-zero"),
 sepd1("fcuda-include-gpubinary"),
 flagpd1("fcuda-is-device"),
@@ -2788,6 +2816,7 @@ flagpd1("fdefault-double-8"),
 flagpd1("fdefault-inline"),
 flagpd1("fdefault-integer-8"),
 flagpd1("fdefault-real-8"),
+flagpd1("fdefine-target-os-macros"),
 flagpd1("fdelayed-template-parsing"),
 flagpd1("fdelete-null-pointer-checks"),
 flagpd1("fdeprecated-macro"),
@@ -2840,6 +2869,7 @@ flagpd1("fexceptions"),
 flagpd1("fexperimental-isel"),
 flagpd1("fexperimental-library"),
 flagpd1("fexperimental-new-constant-interpreter"),
+flagpd1("fexperimental-omit-vtable-rtti"),
 flagpd1("fexperimental-relative-c++-abi-vtables"),
 flagpd1("fexperimental-sanitize-metadata=atomics"),
 flagpd1("fexperimental-sanitize-metadata=covered"),
@@ -2873,6 +2903,33 @@ flagpd1("ffixed-d5"),
 flagpd1("ffixed-d6"),
 flagpd1("ffixed-d7"),
 flagpd1("ffixed-form"),
+flagpd1("ffixed-g1"),
+flagpd1("ffixed-g2"),
+flagpd1("ffixed-g3"),
+flagpd1("ffixed-g4"),
+flagpd1("ffixed-g5"),
+flagpd1("ffixed-g6"),
+flagpd1("ffixed-g7"),
+flagpd1("ffixed-i0"),
+flagpd1("ffixed-i1"),
+flagpd1("ffixed-i2"),
+flagpd1("ffixed-i3"),
+flagpd1("ffixed-i4"),
+flagpd1("ffixed-i5"),
+flagpd1("ffixed-l0"),
+flagpd1("ffixed-l1"),
+flagpd1("ffixed-l2"),
+flagpd1("ffixed-l3"),
+flagpd1("ffixed-l4"),
+flagpd1("ffixed-l5"),
+flagpd1("ffixed-l6"),
+flagpd1("ffixed-l7"),
+flagpd1("ffixed-o0"),
+flagpd1("ffixed-o1"),
+flagpd1("ffixed-o2"),
+flagpd1("ffixed-o3"),
+flagpd1("ffixed-o4"),
+flagpd1("ffixed-o5"),
 flagpd1("ffixed-point"),
 flagpd1("ffixed-r19"),
 flagpd1("ffixed-r9"),
@@ -2910,6 +2967,7 @@ flagpd1("ffixed-x9"),
 flagpd1("ffloat-store"),
 flagpd1("ffor-scope"),
 flagpd1("fforbid-guard-variables"),
+flagpd1("fforce-check-cxx20-modules-input-files"),
 flagpd1("fforce-dwarf-frame"),
 flagpd1("fforce-emit-vtables"),
 flagpd1("fforce-enable-int128"),
@@ -2946,6 +3004,7 @@ flagpd1("fgnu-inline-asm"),
 flagpd1("fgnu-keywords"),
 flagpd1("fgnu-runtime"),
 flagpd1("fgpu-allow-device-init"),
+flagpd1("fgpu-approx-transcendentals"),
 flagpd1("fgpu-defer-diag"),
 flagpd1("fgpu-exclude-wrong-side-overloads"),
 flagpd1("fgpu-flush-denormals-to-zero"),
@@ -2996,6 +3055,8 @@ flagpd1("fjmc"),
 flagpd1("fjump-tables"),
 flagpd1("fkeep-persistent-storage-variables"),
 flagpd1("fkeep-static-consts"),
+flagpd1("fkeep-system-includes"),
+flagpd1("flang-deprecated-no-hlfir"),
 flagpd1("flang-experimental-hlfir"),
 flagpd1("flang-experimental-polymorphism"),
 flagpd1("flarge-sizes"),
@@ -3018,6 +3079,7 @@ flagpd1("flto-unit"),
 flagpd1("flto-visibility-public-std"),
 flagpd1("fmath-errno"),
 flagpd1("fmax-identifier-length"),
+flagpd1("fcoverage-mcdc"),
 flagpd1("fmemory-profile"),
 flagpd1("fmerge-all-constants"),
 flagpd1("fmerge-constants"),
@@ -3040,6 +3102,8 @@ flagpd1("fmodules-disable-diagnostic-validation"),
 flagpd1("fmodules-hash-content"),
 flagpd1("fmodules-local-submodule-visibility"),
 flagpd1("fmodules-search-all"),
+flagpd1("fmodules-skip-diagnostic-options"),
+flagpd1("fmodules-skip-header-search-paths"),
 flagpd1("fmodules-strict-context-hash"),
 flagpd1("fmodules-strict-decluse"),
 sepd1("fmodules-user-build-path"),
@@ -3090,18 +3154,23 @@ flagpd1("fno-all-intrinsics"),
 flagpd1("fno-allow-editor-placeholders"),
 flagpd1("fno-altivec"),
 flagpd1("fno-analyzed-objects-for-unparse"),
+flagpd1("fno-android-pad-segment"),
 flagpd1("fno-keep-inline-functions"),
 flagpd1("fno-unit-at-a-time"),
+flagpd1("fno-apinotes"),
+flagpd1("fno-apinotes-modules"),
 flagpd1("fno-apple-pragma-pack"),
 flagpd1("fno-application-extension"),
 flagpd1("fno-approx-func"),
 flagpd1("fno-asm"),
 flagpd1("fno-asm-blocks"),
 flagpd1("fno-associative-math"),
+flagpd1("fno-assume-nothrow-exception-dtor"),
 flagpd1("fno-assume-sane-operator-new"),
 flagpd1("fno-assume-unique-vtables"),
 flagpd1("fno-async-exceptions"),
 flagpd1("fno-asynchronous-unwind-tables"),
+flagpd1("fno-auto-import"),
 flagpd1("fno-auto-profile"),
 flagpd1("fno-auto-profile-accurate"),
 flagpd1("fno-autolink"),
@@ -3151,7 +3220,6 @@ flagpd1("fno-coroutines"),
 flagpd1("fno-coverage-mapping"),
 flagpd1("fno-crash-diagnostics"),
 flagpd1("fno-cray-pointer"),
-flagpd1("fno-cuda-approx-transcendentals"),
 flagpd1("fno-cuda-flush-denormals-to-zero"),
 flagpd1("fno-cuda-host-device-constexpr"),
 flagpd1("fno-cuda-short-ptr"),
@@ -3175,6 +3243,7 @@ flagpd1("fno-debug-ranges-base-address"),
 flagpd1("fno-debug-types-section"),
 flagpd1("fno-declspec"),
 flagpd1("fno-default-inline"),
+flagpd1("fno-define-target-os-macros"),
 flagpd1("fno-delayed-template-parsing"),
 flagpd1("fno-delete-null-pointer-checks"),
 flagpd1("fno-deprecated-macro"),
@@ -3209,6 +3278,7 @@ flagpd1("fno-escaping-block-tail-calls"),
 flagpd1("fno-exceptions"),
 flagpd1("fno-experimental-isel"),
 flagpd1("fno-experimental-library"),
+flagpd1("fno-experimental-omit-vtable-rtti"),
 flagpd1("fno-experimental-relative-c++-abi-vtables"),
 flagpd1("fno-external-blas"),
 flagpd1("fno-f2c"),
@@ -3247,6 +3317,7 @@ flagpd1("fno-gnu89-inline"),
 flagpd1("fno-gnu-inline-asm"),
 flagpd1("fno-gnu-keywords"),
 flagpd1("fno-gpu-allow-device-init"),
+flagpd1("fno-gpu-approx-transcendentals"),
 flagpd1("fno-gpu-defer-diag"),
 flagpd1("fno-gpu-exclude-wrong-side-overloads"),
 flagpd1("fno-gpu-flush-denormals-to-zero"),
@@ -3278,6 +3349,7 @@ flagpd1("fno-jmc"),
 flagpd1("fno-jump-tables"),
 flagpd1("fno-keep-persistent-storage-variables"),
 flagpd1("fno-keep-static-consts"),
+flagpd1("fno-keep-system-includes"),
 flagpd1("fno-knr-functions"),
 flagpd1("fno-lax-vector-conversions"),
 flagpd1("fno-limit-debug-info"),
@@ -3296,6 +3368,7 @@ flagpd1("fno-math-builtin"),
 flagpd1("fno-math-errno"),
 flagpd1("fno-max-identifier-length"),
 flagpd1("fno-max-type-align"),
+flagpd1("fno-coverage-mcdc"),
 flagpd1("fno-memory-profile"),
 flagpd1("fno-merge-all-constants"),
 flagpd1("fno-merge-constants"),
@@ -3309,6 +3382,8 @@ flagpd1("fno-modules-error-recovery"),
 flagpd1("fno-modules-global-index"),
 flagpd1("fno-modules-search-all"),
 flagpd1("fno-modules-share-filemanager"),
+flagpd1("fno-modules-skip-diagnostic-options"),
+flagpd1("fno-modules-skip-header-search-paths"),
 flagpd1("fno-strict-modules-decluse"),
 flagpd1("fno_modules-validate-input-files-content"),
 flagpd1("fno-modules-validate-system-headers"),
@@ -3317,6 +3392,7 @@ flagpd1("fno-modulo-sched"),
 flagpd1("fno-modulo-sched-allow-regmoves"),
 flagpd1("fno-ms-compatibility"),
 flagpd1("fno-ms-extensions"),
+flagpd1("fno-ms-volatile"),
 flagpd1("fno-new-infallible"),
 flagpd1("fno-non-call-exceptions"),
 flagpd1("fno-objc-arc"),
@@ -3329,7 +3405,9 @@ flagpd1("fno-objc-infer-related-result-type"),
 flagpd1("fno-objc-legacy-dispatch"),
 flagpd1("fno-objc-nonfragile-abi"),
 flagpd1("fno-objc-weak"),
+flagpd1("fno-offload-implicit-host-device-templates"),
 flagpd1("fno-offload-lto"),
+flagpd1("fno-offload-uniform-block"),
 .{
     .name = "fno-omit-frame-pointer",
     .syntax = .flag,
@@ -3379,6 +3457,7 @@ flagpd1("fno-permissive"),
     .psl = false,
 },
 flagpd1("fno-plt"),
+flagpd1("fno-ppc-native-vector-element-order"),
 flagpd1("fno-prebuilt-implicit-modules"),
 flagpd1("fno-prefetch-loop-arrays"),
 flagpd1("fno-preserve-as-comments"),
@@ -3469,6 +3548,7 @@ flagpd1("fno-signed-wchar"),
 flagpd1("fno-signed-zeros"),
 flagpd1("fno-single-precision-constant"),
 flagpd1("fno-sized-deallocation"),
+flagpd1("fno-skip-odr-check-in-gmf"),
 flagpd1("fno-slp-vectorize"),
 flagpd1("fno-spec-constr-count"),
 flagpd1("fno-spell-checking"),
@@ -3547,6 +3627,7 @@ flagpd1("fno-variable-expansion-in-unroller"),
 flagpd1("fno-vect-cost-model"),
 flagpd1("fno-vectorize"),
 flagpd1("fno-verbose-asm"),
+flagpd1("fno-verify-intermediate-code"),
 flagpd1("fno-virtual-function-elimination"),
 flagpd1("fno-visibility-from-dllstorageclass"),
 flagpd1("fno-visibility-inlines-hidden"),
@@ -3591,7 +3672,9 @@ flagpd1("fobjc-runtime-has-weak"),
 flagpd1("fobjc-sender-dependent-dispatch"),
 flagpd1("fobjc-subscripting-legacy-runtime"),
 flagpd1("fobjc-weak"),
+flagpd1("foffload-implicit-host-device-templates"),
 flagpd1("foffload-lto"),
+flagpd1("foffload-uniform-block"),
 .{
     .name = "fomit-frame-pointer",
     .syntax = .flag,
@@ -3609,6 +3692,7 @@ flagpd1("fopenmp-assume-threads-oversubscription"),
 flagpd1("fopenmp-cuda-mode"),
 flagpd1("fopenmp-enable-irbuilder"),
 flagpd1("fopenmp-extensions"),
+flagpd1("fopenmp-force-usm"),
 sepd1("fopenmp-host-ir-file-path"),
 flagpd1("fopenmp-is-target-device"),
 flagpd1("fopenmp-new-driver"),
@@ -3657,6 +3741,7 @@ flagpd1("fpermissive"),
     .psl = false,
 },
 flagpd1("fplt"),
+flagpd1("fppc-native-vector-element-order"),
 flagpd1("fprebuilt-implicit-modules"),
 flagpd1("fprefetch-loop-arrays"),
 flagpd1("fpreserve-as-comments"),
@@ -3779,6 +3864,7 @@ flagpd1("fsigned-zeros"),
 flagpd1("fsingle-precision-constant"),
 flagpd1("fsized-deallocation"),
 flagpd1("fsjlj-exceptions"),
+flagpd1("fskip-odr-check-in-gmf"),
 flagpd1("fslp-vectorize"),
 flagpd1("fspec-constr-count"),
 flagpd1("fspell-checking"),
@@ -3886,6 +3972,7 @@ flagpd1("fvect-cost-model"),
 flagpd1("fvectorize"),
 flagpd1("fverbose-asm"),
 flagpd1("fverify-debuginfo-preserve"),
+flagpd1("fverify-intermediate-code"),
 flagpd1("fvirtual-function-elimination"),
 flagpd1("fvisibility-from-dllstorageclass"),
 flagpd1("fvisibility-global-new-delete-hidden"),
@@ -4042,6 +4129,7 @@ flagpd1("gno-strict-dwarf"),
     .psl = false,
 },
 flagpd1("gpubnames"),
+flagpd1("gpulibc"),
 flagpd1("grecord-command-line"),
 flagpd1("gsce"),
 flagpd1("gsimple-template-names"),
@@ -4067,6 +4155,22 @@ sepd1("header-include-file"),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "hipstdpar",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
+.{
+    .name = "hipstdpar-interpose-alloc",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 flagpd1("ibuiltininc"),
 sepd1("image_base"),
 sepd1("imultilib"),
@@ -4112,6 +4216,7 @@ m("maes"),
 sepd1("main-file-name"),
 flagpd1("maix32"),
 flagpd1("maix64"),
+m("maix-small-local-exec-tls"),
 flagpd1("maix-struct-return"),
 flagpd1("malign-double"),
 m("maltivec"),
@@ -4121,11 +4226,15 @@ m("mamx-complex"),
 m("mamx-fp16"),
 m("mamx-int8"),
 m("mamx-tile"),
+flagpd1("mapxf"),
 flagpd1("marm"),
 flagpd1("massembler-fatal-warnings"),
 flagpd1("massembler-no-warn"),
 m("matomics"),
 m("mavx"),
+flagpd1("mavx10.1"),
+m("mavx10.1-256"),
+m("mavx10.1-512"),
 m("mavx2"),
 m("mavx512bf16"),
 m("mavx512bitalg"),
@@ -4148,11 +4257,12 @@ m("mavxneconvert"),
 m("mavxvnni"),
 m("mavxvnniint16"),
 m("mavxvnniint8"),
-flagpd1("mbackchain"),
+m("mbackchain"),
 flagpd1("mbig-endian"),
 m("mbmi"),
 m("mbmi2"),
 flagpd1("mbranch-likely"),
+flagpd1("mbranch-protection-pauth-lr"),
 flagpd1("mbranch-target-enforce"),
 flagpd1("mbranches-within-32B-boundaries"),
 m("mbulk-memory"),
@@ -4162,8 +4272,6 @@ m("mcldemote"),
 m("mclflushopt"),
 m("mclwb"),
 m("mclzero"),
-flagpd1("mcmodel=medany"),
-flagpd1("mcmodel=medlow"),
 m("mcmpb"),
 m("mcmpccxadd"),
 flagpd1("mcmse"),
@@ -4186,6 +4294,7 @@ flagpd1("menable-experimental-extensions"),
 flagpd1("menable-no-infs"),
 flagpd1("menable-no-nans"),
 m("menqcmd"),
+m("mevex512"),
 m("mexception-handling"),
 m("mexecute-only"),
 m("mextended-const"),
@@ -4218,6 +4327,7 @@ m("mginv"),
 flagpd1("mglibc"),
 flagpd1("mglobal-merge"),
 flagpd1("mgpopt"),
+flagpd1("mguarded-control-stack"),
 m("mhard-float"),
 m("mhard-quad-float"),
 m("mhvx"),
@@ -4257,6 +4367,7 @@ flagpd1("mips64r6"),
 m("misel"),
 flagpd1("mkernel"),
 m("mkl"),
+m("mlasx"),
 flagpd1("mldc1-sdc1"),
 sepd1("mlimit-float-precision"),
 sepd1("mlink-bitcode-file"),
@@ -4269,6 +4380,7 @@ flagpd1("mlong-double-128"),
 flagpd1("mlong-double-64"),
 flagpd1("mlong-double-80"),
 m("mlongcall"),
+m("mlsx"),
 m("mlvi-cfi"),
 flagpd1("mlvi-hardening"),
 m("mlwp"),
@@ -4289,6 +4401,7 @@ flagpd1("mmpx"),
 flagpd1("mms-bitfields"),
 m("mmsa"),
 m("mmt"),
+m("mmultimemory"),
 m("mmultivalue"),
 m("mmutable-globals"),
 m("mmwaitx"),
@@ -4305,8 +4418,12 @@ m("mno-amx-complex"),
 m("mno-amx-fp16"),
 m("mno-amx-int8"),
 m("mno-amx-tile"),
+flagpd1("mno-apxf"),
 m("mno-atomics"),
 m("mno-avx"),
+flagpd1("mno-avx10.1"),
+m("mno-avx10.1-256"),
+m("mno-avx10.1-512"),
 m("mno-avx2"),
 m("mno-avx512bf16"),
 m("mno-avx512bitalg"),
@@ -4329,7 +4446,7 @@ m("mno-avxneconvert"),
 m("mno-avxvnni"),
 m("mno-avxvnniint16"),
 m("mno-avxvnniint8"),
-flagpd1("mno-backchain"),
+m("mno-backchain"),
 m("mno-bmi"),
 m("mno-bmi2"),
 flagpd1("mno-branch-likely"),
@@ -4353,6 +4470,7 @@ m("mno-dsp"),
 m("mno-dspr2"),
 flagpd1("mno-embedded-data"),
 m("mno-enqcmd"),
+m("mno-evex512"),
 m("mno-exception-handling"),
 flagpd1("mnoexecstack"),
 m("mno-execute-only"),
@@ -4391,10 +4509,12 @@ m("mno-invariant-function-descriptors"),
 m("mno-invpcid"),
 m("mno-isel"),
 m("mno-kl"),
+m("mno-lasx"),
 flagpd1("mno-ldc1-sdc1"),
 flagpd1("mno-local-sdata"),
 m("mno-long-calls"),
 m("mno-longcall"),
+m("mno-lsx"),
 m("mno-lvi-cfi"),
 flagpd1("mno-lvi-hardening"),
 m("mno-lwp"),
@@ -4415,6 +4535,7 @@ flagpd1("mno-mpx"),
 flagpd1("mno-ms-bitfields"),
 m("mno-msa"),
 m("mno-mt"),
+m("mno-multimemory"),
 m("mno-multivalue"),
 m("mno-mutable-globals"),
 m("mno-mwaitx"),
@@ -4460,6 +4581,7 @@ m("mno-rdseed"),
     .psl = false,
 },
 m("mno-reference-types"),
+flagpd1("mno-regnames"),
 m("mno-relax"),
 flagpd1("mno-relax-all"),
 flagpd1("mno-relax-pic-calls"),
@@ -4507,7 +4629,9 @@ flagpd1("mno-type-check"),
 m("mno-uintr"),
 flagpd1("mno-unaligned-access"),
 flagpd1("mno-unsafe-fp-atomics"),
+m("mno-usermsr"),
 m("mno-vaes"),
+flagpd1("mno-vevpu"),
 m("mno-virt"),
 m("mno-vis"),
 m("mno-vis2"),
@@ -4587,6 +4711,7 @@ flagpd1("mrecord-mcount"),
     .psl = false,
 },
 m("mreference-types"),
+flagpd1("mregnames"),
 sepd1("mregparm"),
 m("mrelax"),
 flagpd1("mrelax-all"),
@@ -4649,6 +4774,7 @@ sepd1("multiply_defined"),
 sepd1("multiply_defined_unused"),
 flagpd1("munaligned-access"),
 flagpd1("munsafe-fp-atomics"),
+m("musermsr"),
 m("mv5"),
 m("mv55"),
 m("mv60"),
@@ -4663,6 +4789,7 @@ m("mv71"),
 flagpd1("mv71t"),
 m("mv73"),
 m("mvaes"),
+flagpd1("mvevpu"),
 m("mvirt"),
 m("mvis"),
 m("mvis2"),
@@ -4720,6 +4847,7 @@ flagpd1("no-cpp-precomp"),
 },
 flagpd1("no-emit-llvm-uselists"),
 flagpd1("no-enable-noundef-analysis"),
+flagpd1("fno-fortran-main"),
 .{
     .name = "no-gpu-bundle-output",
     .syntax = .flag,
@@ -4746,6 +4874,14 @@ flagpd1("no-implicit-float"),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "no-offload-compress",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 .{
     .name = "no-offload-new-driver",
     .syntax = .flag,
@@ -4780,6 +4916,7 @@ flagpd1("nodriverkitlib"),
 flagpd1("nofixprebinding"),
 flagpd1("nogpuinc"),
 flagpd1("nogpulib"),
+flagpd1("nogpulibc"),
 flagpd1("nohipwrapperinc"),
 .{
     .name = "nolibc",
@@ -4870,6 +5007,14 @@ sepd1("object-file-name"),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "offload-compress",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 .{
     .name = "offload-device-only",
     .syntax = .flag,
@@ -4910,6 +5055,7 @@ sepd1("object-file-name"),
     .pd2 = true,
     .psl = false,
 },
+sepd1("fexperimental-openacc-macro-override"),
 sepd1("opt-record-file"),
 sepd1("opt-record-format"),
 sepd1("opt-record-passes"),
@@ -5064,6 +5210,14 @@ flagpd1("print-stats"),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "print-supported-extensions",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = true,
+    .psl = false,
+},
 .{
     .name = "print-target-triple",
     .syntax = .flag,
@@ -5101,6 +5255,7 @@ flagpd1("pthreads"),
 },
 sepd1("read_only_relocs"),
 sepd1("record-command-line"),
+flagpd1("regcall4"),
 flagpd1("relaxed-aliasing"),
 .{
     .name = "relocatable-pch",
@@ -5235,6 +5390,14 @@ sepd1("source-date-epoch"),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "spirv",
+    .syntax = .flag,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = true,
+},
 sepd1("split-dwarf-file"),
 sepd1("split-dwarf-output"),
 .{
@@ -5592,6 +5755,7 @@ joinpd1("fexperimental-sanitize-metadata-ignorelist="),
 joinpd1("fsanitize-undefined-strip-path-components="),
 joinpd1("fopenmp-cuda-teams-reduction-recs-num="),
 joinpd1("fvisibility-externs-nodllstorageclass="),
+joinpd1("fexperimental-openacc-macro-override="),
 joinpd1("analyzer-config-compatibility-mode="),
 .{
     .name = "fno-experimental-sanitize-metadata=",
@@ -5628,6 +5792,7 @@ joinpd1("analyzer-inline-max-stack-depth="),
     .psl = false,
 },
 joinpd1("fsanitize-address-field-padding="),
+joinpd1("ftrivial-auto-var-init-max-size="),
 .{
     .name = "fno-sanitize-address-vcasan-lib",
     .syntax = .joined,
@@ -5642,6 +5807,7 @@ joinpd1("fsanitize-memory-track-origins="),
 joinpd1("mwatchos-simulator-version-min="),
 joinpd1("fsanitize-coverage-ignorelist="),
 joinpd1("fvisibility-externs-dllimport="),
+joinpd1("fvisibility-global-new-delete="),
 joinpd1("fvisibility-nodllstorageclass="),
 joinpd1("fxray-selected-function-group="),
 joinpd1("mappletvsimulator-version-min="),
@@ -5721,6 +5887,7 @@ joinpd1("fopenmp-cuda-blocks-per-sm="),
 },
 joinpd1("mios-simulator-version-min="),
 joinpd1("mstack-protector-guard-reg="),
+joinpd1("Wsystem-headers-in-module="),
 .{
     .name = "include-with-prefix-after=",
     .syntax = .joined,
@@ -5779,6 +5946,7 @@ joinpd1("msign-return-address-key="),
     .pd2 = true,
     .psl = false,
 },
+joinpd1("fapinotes-swift-version="),
 .{
     .name = "fcomment-block-commands=",
     .syntax = .comma_joined,
@@ -5858,6 +6026,15 @@ joinpd1("fspell-checking-limit="),
 joinpd1("fvisibility-dllexport="),
 joinpd1("fxray-function-groups="),
 joinpd1("header-include-format="),
+.{
+    .name = "hipstdpar-thrust-path=",
+    .syntax = .joined,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
+joinpd1("mlarge-data-threshold="),
 joinpd1("msmall-data-threshold="),
 joinpd1("Wlarge-by-value-copy="),
 joinpd1("analyzer-constraints="),
@@ -5909,8 +6086,6 @@ joinpd1("mwatchos-version-min="),
     .psl = false,
 },
 joinpd1("faltivec-src-compat="),
-joinpd1("mmacosx-version-min="),
-joinpd1("fsanitize-blacklist="),
 .{
     .name = "hip-device-lib-path=",
     .syntax = .joined,
@@ -5919,7 +6094,9 @@ joinpd1("fsanitize-blacklist="),
     .pd2 = true,
     .psl = false,
 },
+joinpd1("mmacosx-version-min="),
 joinpd1("coverage-notes-file="),
+joinpd1("fsanitize-blacklist="),
 .{
     .name = "extract-api-ignores=",
     .syntax = .comma_joined,
@@ -5936,9 +6113,19 @@ joinpd1("fmemory-profile-use="),
 joinpd1("fmodules-cache-path="),
 joinpd1("fmodules-embed-file="),
 joinpd1("fms-omit-default-lib"),
+joinpd1("fno-cx-fortran-rules"),
+joinpd1("fno-cx-limited-range"),
 joinpd1("fprofile-instrument="),
 joinpd1("fprofile-sample-use="),
 joinpd1("fstrict-flex-arrays="),
+.{
+    .name = "hipstdpar-prim-path=",
+    .syntax = .joined,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 .{
     .name = "no-cuda-include-ptx=",
     .syntax = .joined,
@@ -5948,8 +6135,8 @@ joinpd1("fstrict-flex-arrays="),
     .psl = false,
 },
 joinpd1("Wframe-larger-than="),
-joinpd1("code-completion-at="),
 joinpd1("coverage-data-file="),
+joinpd1("code-completion-at="),
 joinpd1("fblas-matmul-limit="),
 joinpd1("fcrash-diagnostics="),
 joinpd1("fdiagnostics-color="),
@@ -6093,16 +6280,27 @@ joinpd1("coverage-version="),
 joinpd1("falign-functions="),
 joinpd1("fconstexpr-depth="),
 joinpd1("fconstexpr-steps="),
+joinpd1("fcx-fortran-rules"),
+joinpd1("fcx-limited-range"),
 joinpd1("ffile-prefix-map="),
 joinpd1("fmodule-map-file="),
 joinpd1("fobjc-arc-cxxlib="),
 joinpd1("fproc-stat-report"),
 joinpd1("ftype-visibility="),
 joinpd1("fwarn-stack-size="),
+jspd1("iapinotes-modules"),
 jspd1("iwithprefixbefore"),
 joinpd1("malign-functions="),
 joinpd1("mfunction-return="),
 joinpd1("mios-version-min="),
+.{
+    .name = "mno-apx-features=",
+    .syntax = .comma_joined,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 joinpd1("mrvv-vector-bits="),
 joinpd1("mstack-alignment="),
 joinpd1("msve-vector-bits="),
@@ -6164,6 +6362,7 @@ joinpd1("fms-runtime-lib="),
 joinpd1("fopenmp-version="),
 joinpd1("fprofile-update="),
 joinpd1("fshow-overloads="),
+joinpd1("fspv-target-env="),
 joinpd1("fswift-async-fp="),
 joinpd1("ftemplate-depth="),
 joinpd1("fxray-attr-list="),
@@ -6302,6 +6501,14 @@ joinpd1("gen-reproducer="),
     .pd2 = true,
     .psl = false,
 },
+.{
+    .name = "hipstdpar-path=",
+    .syntax = .joined,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 joinpd1("mdynamic-no-pic"),
 joinpd1("mframe-pointer="),
 joinpd1("mindirect-jump="),
@@ -6331,6 +6538,7 @@ joinpd1("preamble-bytes="),
     .pd2 = true,
     .psl = false,
 },
+joinpd1("complex-range="),
 .{
     .name = "cuda-gpu-arch=",
     .syntax = .joined,
@@ -6381,6 +6589,14 @@ joinpd1("fprofile-list="),
     .pd2 = false,
     .psl = false,
 },
+.{
+    .name = "mapx-features=",
+    .syntax = .comma_joined,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 joinpd1("vtordisp-mode="),
 joinpd1("Rpass-missed="),
 joinpd1("Wlarger-than-"),
@@ -6465,6 +6681,7 @@ joinpd1("malign-loops="),
 joinpd1("mframe-chain="),
 joinpd1("mimplicit-it="),
 joinpd1("mprintf-kind="),
+joinpd1("mtls-dialect="),
 .{
     .name = "offload-arch=",
     .syntax = .joined,
@@ -6593,6 +6810,14 @@ joinpd1("fclasspath="),
 joinpd1("finit-real="),
 joinpd1("fforce-addr"),
 joinpd1("ftls-model="),
+.{
+    .name = "gcc-triple=",
+    .syntax = .joined,
+    .zig_equivalent = .other,
+    .pd1 = false,
+    .pd2 = true,
+    .psl = false,
+},
 joinpd1("inline-asm="),
 jspd1("ivfsoverlay"),
 jspd1("iwithprefix"),
@@ -7287,14 +7512,6 @@ joinpd1("mtp="),
 },
 joinpd1("gz="),
 joinpd1("A-"),
-.{
-    .name = "Fo",
-    .syntax = .joined_or_separate,
-    .zig_equivalent = .other,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = true,
-},
 joinpd1("G="),
 .{
     .name = "MF",
@@ -7560,6 +7777,22 @@ joinpd1("G="),
     .pd2 = false,
     .psl = true,
 },
+.{
+    .name = "Fc",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = true,
+},
+.{
+    .name = "Fo",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .other,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = true,
+},
 jspd1("A"),
 jspd1("B"),
 jspd1("D"),
@@ -7660,14 +7893,6 @@ joinpd1("W"),
 },
 jspd1("b"),
 joinpd1("d"),
-.{
-    .name = "e",
-    .syntax = .joined_or_separate,
-    .zig_equivalent = .entry,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = false,
-},
 .{
     .name = "l",
     .syntax = .joined_or_separate,
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 8031e6dcdb..6308189bb2 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -552,24 +552,27 @@ fn knownOption(name: []const u8) ?[]const u8 {
 
 const cpu_targets = struct {
     pub const aarch64 = std.Target.aarch64;
-    pub const arc = std.Target.arc;
     pub const amdgpu = std.Target.amdgpu;
+    pub const arc = std.Target.arc;
     pub const arm = std.Target.arm;
     pub const avr = std.Target.avr;
     pub const bpf = std.Target.bpf;
     pub const csky = std.Target.csky;
     pub const hexagon = std.Target.hexagon;
+    pub const loongarch = std.Target.loongarch;
+    pub const m68k = std.Target.m68k;
     pub const mips = std.Target.mips;
     pub const msp430 = std.Target.msp430;
     pub const nvptx = std.Target.nvptx;
     pub const powerpc = std.Target.powerpc;
     pub const riscv = std.Target.riscv;
+    pub const s390x = std.Target.s390x;
     pub const sparc = std.Target.sparc;
     pub const spirv = std.Target.spirv;
-    pub const s390x = std.Target.s390x;
     pub const ve = std.Target.ve;
     pub const wasm = std.Target.wasm;
     pub const x86 = std.Target.x86;
+    pub const xtensa = std.Target.xtensa;
 };
 
 pub fn main() anyerror!void {