From aac91a1ac8c2a7edafe1966702d012da580376ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Tue, 20 Oct 2026 00:23:44 +0200
Subject: [PATCH] update_cpu_features: omit the dummy and dwarfris bpf features

---
 lib/std/Target/bpf.zig        | 12 ------------
 tools/update_cpu_features.zig | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/std/Target/bpf.zig b/lib/std/Target/bpf.zig
index f55ebf8b01ef0ae8947914c8ee53c47847bcfd49..9251304a312f2158f4b2cb5955c07ebc853af3ac 100644
--- a/lib/std/Target/bpf.zig
+++ b/lib/std/Target/bpf.zig
@@ -7,8 +7,6 @@ const CpuModel = std.Target.Cpu.Model;
 pub const Feature = enum {
     allows_misaligned_mem_access,
     alu32,
-    dummy,
-    dwarfris,
 };
 
 pub const featureSet = CpuFeature.FeatureSetFns(Feature).featureSet;
@@ -30,16 +28,6 @@ pub const all_features = blk: {
         .description = "Enable ALU32 instructions",
         .dependencies = featureSet(&[_]Feature{}),
     };
-    result[@backingInt(Feature.dummy)] = .{
-        .llvm_name = "dummy",
-        .description = "unused feature",
-        .dependencies = featureSet(&[_]Feature{}),
-    };
-    result[@backingInt(Feature.dwarfris)] = .{
-        .llvm_name = "dwarfris",
-        .description = "Disable MCAsmInfo DwarfUsesRelocationsAcrossSections",
-        .dependencies = featureSet(&[_]Feature{}),
-    };
     const ti = @typeInfo(Feature);
     for (&result, 0..) |*elem, i| {
         elem.index = i;
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 586d1c87c77a25fb8516783820ab556d7c9fed79..6ed304fd5f3beeeeb9cd5c26bac55a45a263cd5d 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -1175,6 +1175,16 @@ const targets = [_]ArchTarget{
             .name = "BPF",
             .td_name = "BPF",
         },
+        .feature_overrides = &.{
+            .{
+                .llvm_name = "dummy",
+                .omit = true,
+            },
+            .{
+                .llvm_name = "dwarfris",
+                .omit = true,
+            },
+        },
     },
     .{
         .zig_name = "csky",
-- 
2.54.0