From fa6a8b3c8aec497dee6f18690ca9c1d0898f0e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Tue, 24 Sep 2024 11:08:29 +0200
Subject: [PATCH] update_cpu_features: Add support for parsing DefaultExts as
 used for aarch64.

---
 tools/update_cpu_features.zig | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 63637d8f7808..642e3ebc2c32 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -61,10 +61,6 @@ const llvm_targets = [_]LlvmTarget{
                 .zig_name = "contextidr_el2",
                 .desc = "Enable RW operand Context ID Register (EL2)",
             },
-            .{
-                .llvm_name = "v8a",
-                .extra_deps = &.{"neon"},
-            },
             .{
                 .llvm_name = "neoversee1",
                 .flatten = true,
@@ -1436,6 +1432,24 @@ fn processOneTarget(job: Job) anyerror!void {
                         try deps.append(other_zig_name);
                     }
                 }
+                // This is used by AArch64.
+                if (kv.value_ptr.object.get("DefaultExts")) |exts_val| {
+                    for (exts_val.array.items) |ext| {
+                        const other_key = ext.object.get("def").?.string;
+                        const other_obj = &root_map.getPtr(other_key).?.object;
+                        const other_llvm_name = other_obj.get("Name").?.string;
+                        const other_zig_name = (try llvmFeatureNameToZigNameOmit(
+                            arena,
+                            llvm_target,
+                            other_llvm_name,
+                        )) orelse continue;
+                        for (omit_deps) |omit_dep| {
+                            if (mem.eql(u8, other_zig_name, omit_dep)) break;
+                        } else {
+                            try deps.append(other_zig_name);
+                        }
+                    }
+                }
                 for (extra_deps) |extra_dep| {
                     try deps.append(extra_dep);
                 }