diff --git a/lib/std/Target/arm.zig b/lib/std/Target/arm.zig
index bcad2d76384d46138448d6e2616cc2d331a3d965..ee77e4d1196d2d2f1562d72e201a3c7f929c1655 100644
--- a/lib/std/Target/arm.zig
+++ b/lib/std/Target/arm.zig
@@ -2285,12 +2285,10 @@ pub const cpu = struct {
         .name = "cortex_m52",
         .llvm_name = "cortex-m52",
         .features = featureSet(&[_]Feature{
-            .fp_armv8d16,
+            .dsp,
             .loop_align,
             .mve1beat,
-            .mve_fp,
             .no_branch_predictor,
-            .pacbti,
             .slowfpvmlx,
             .use_misched,
             .v8_1m_main,
@@ -2364,16 +2362,13 @@ pub const cpu = struct {
             .slowfpvfmx,
             .slowfpvmlx,
             .v7r,
-            .vfp3d16,
         }),
     };
     pub const cortex_r52: CpuModel = .{
         .name = "cortex_r52",
         .llvm_name = "cortex-r52",
         .features = featureSet(&[_]Feature{
-            .fp_armv8,
             .fpao,
-            .neon,
             .use_misched,
             .v8r,
         }),
@@ -2382,9 +2377,7 @@ pub const cpu = struct {
         .name = "cortex_r52plus",
         .llvm_name = "cortex-r52plus",
         .features = featureSet(&[_]Feature{
-            .fp_armv8,
             .fpao,
-            .neon,
             .use_misched,
             .v8r,
         }),
@@ -2394,7 +2387,6 @@ pub const cpu = struct {
         .llvm_name = "cortex-r7",
         .features = featureSet(&[_]Feature{
             .avoid_partial_cpsr,
-            .fp16,
             .hwdiv_arm,
             .mp,
             .ret_addr_stack,
@@ -2402,7 +2394,6 @@ pub const cpu = struct {
             .slowfpvfmx,
             .slowfpvmlx,
             .v7r,
-            .vfp3d16,
         }),
     };
     pub const cortex_r8: CpuModel = .{
@@ -2410,7 +2401,6 @@ pub const cpu = struct {
         .llvm_name = "cortex-r8",
         .features = featureSet(&[_]Feature{
             .avoid_partial_cpsr,
-            .fp16,
             .hwdiv_arm,
             .mp,
             .ret_addr_stack,
@@ -2418,7 +2408,6 @@ pub const cpu = struct {
             .slowfpvfmx,
             .slowfpvmlx,
             .v7r,
-            .vfp3d16,
         }),
     };
     pub const cortex_x1: CpuModel = .{
@@ -2666,9 +2655,7 @@ pub const cpu = struct {
         .llvm_name = "star-mc1",
         .features = featureSet(&[_]Feature{
             .avoid_muls,
-            .dsp,
             .fix_cmse_cve_2021_35465,
-            .fp_armv8d16sp,
             .loop_align,
             .no_branch_predictor,
             .slowfpvfmx,
@@ -2681,12 +2668,10 @@ pub const cpu = struct {
         .name = "star_mc3",
         .llvm_name = "star-mc3",
         .features = featureSet(&[_]Feature{
-            .fp_armv8d16,
+            .dsp,
             .loop_align,
             .mve1beat,
-            .mve_fp,
             .no_branch_predictor,
-            .pacbti,
             .slowfpvmlx,
             .use_misched,
             .v8_1m_main,
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 10200ae1ebbcdf20c63a5614328b874d0ea7fe4a..500ec9570076c4230e6041dcfb72176c53ee368c 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -614,7 +614,75 @@ const targets = [_]ArchTarget{
         .branch_quota = 10000,
         .feature_overrides = &.{
             .{
-                .llvm_name = "exynos",
+                .llvm_name = "a5",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a7",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a8",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a9",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a12",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a15",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a17",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a32",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a35",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a53",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a55",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a57",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a72",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a73",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a75",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a76",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a77",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "a78c",
                 .flatten = true,
             },
             .{
@@ -629,6 +697,63 @@ const targets = [_]ArchTarget{
                 .llvm_name = "cortex-a710",
                 .flatten = true,
             },
+            .{
+                .llvm_name = "cortex-x1",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "cortex-x1c",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "exynos",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "krait",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "kryo",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "m3",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "m7",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "neoverse-v1",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "r4",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "r5",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "r7",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "r52",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "r52plus",
+                .flatten = true,
+            },
+            .{
+                .llvm_name = "swift",
+                .flatten = true,
+            },
+
             .{
                 .llvm_name = "cortex-m4",
                 .omit_deps = &.{"vfp4d16sp"},
@@ -639,144 +764,53 @@ const targets = [_]ArchTarget{
             },
             .{
                 .llvm_name = "cortex-m33",
-                .omit_deps = &.{ "fp_armv8d16sp", "dsp" },
+                .omit_deps = &.{ "dsp", "fp_armv8d16sp" },
             },
             .{
                 .llvm_name = "cortex-m35p",
-                .omit_deps = &.{ "fp_armv8d16sp", "dsp" },
+                .omit_deps = &.{ "dsp", "fp_armv8d16sp" },
+            },
+            .{
+                .llvm_name = "cortex-m52",
+                .omit_deps = &.{ "fp_armv8d16", "mve_fp", "pacbti" },
             },
             .{
                 .llvm_name = "cortex-m55",
-                .omit_deps = &.{ "mve_fp", "fp_armv8d16" },
+                .omit_deps = &.{ "fp_armv8d16", "mve_fp" },
             },
             .{
                 .llvm_name = "cortex-m85",
-                .omit_deps = &.{ "mve_fp", "pacbti", "fp_armv8d16" },
+                .omit_deps = &.{ "fp_armv8d16", "mve_fp", "pacbti" },
             },
             .{
-                .llvm_name = "cortex-x1c",
-                .flatten = true,
+                .llvm_name = "cortex-r5",
+                .omit_deps = &.{"vfp3d16"},
             },
             .{
-                .llvm_name = "r4",
-                .flatten = true,
+                .llvm_name = "cortex-r7",
+                .omit_deps = &.{ "fp16", "vfp3d16" },
             },
             .{
-                .llvm_name = "r52plus",
-                .flatten = true,
+                .llvm_name = "cortex-r8",
+                .omit_deps = &.{ "fp16", "vfp3d16" },
             },
             .{
-                .llvm_name = "r5",
-                .flatten = true,
+                .llvm_name = "cortex-r52",
+                .omit_deps = &.{ "fp_armv8", "neon" },
             },
             .{
-                .llvm_name = "r52",
-                .flatten = true,
+                .llvm_name = "cortex-r52plus",
+                .omit_deps = &.{ "fp_armv8", "neon" },
             },
             .{
-                .llvm_name = "r7",
-                .flatten = true,
+                .llvm_name = "star-mc1",
+                .omit_deps = &.{ "dsp", "fp_armv8d16sp" },
             },
             .{
-                .llvm_name = "m3",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "m7",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "krait",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "kryo",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "swift",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "cortex-x1",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "neoverse-v1",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a5",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a7",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a8",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a9",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a12",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a15",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a17",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a32",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a35",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a53",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a55",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a57",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a72",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a73",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a75",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a76",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a77",
-                .flatten = true,
-            },
-            .{
-                .llvm_name = "a78c",
-                .flatten = true,
+                .llvm_name = "star-mc3",
+                .omit_deps = &.{ "fp_armv8d16", "mve_fp", "pacbti" },
             },
+
             .{
                 .llvm_name = "armv2",
                 .zig_name = "v2",