diff --git a/lib/std/builtin/assembly.zig b/lib/std/builtin/assembly.zig
index e24082ff86..b614017209 100644
--- a/lib/std/builtin/assembly.zig
+++ b/lib/std/builtin/assembly.zig
@@ -199,41 +199,6 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         ds: bool = false,
         fs: bool = false,
         gs: bool = false,
-        rip: bool = false,
-        eip: bool = false,
-        ip: bool = false,
-        cr0: bool = false,
-        cr1: bool = false,
-        cr2: bool = false,
-        cr3: bool = false,
-        cr4: bool = false,
-        cr5: bool = false,
-        cr6: bool = false,
-        cr7: bool = false,
-        cr8: bool = false,
-        cr9: bool = false,
-        cr10: bool = false,
-        cr11: bool = false,
-        cr12: bool = false,
-        cr13: bool = false,
-        cr14: bool = false,
-        cr15: bool = false,
-        dr0: bool = false,
-        dr1: bool = false,
-        dr2: bool = false,
-        dr3: bool = false,
-        dr4: bool = false,
-        dr5: bool = false,
-        dr6: bool = false,
-        dr7: bool = false,
-        dr8: bool = false,
-        dr9: bool = false,
-        dr10: bool = false,
-        dr11: bool = false,
-        dr12: bool = false,
-        dr13: bool = false,
-        dr14: bool = false,
-        dr15: bool = false,
     },
     .aarch64, .aarch64_be => packed struct {
         /// Whether the inline assembly code may perform stores to memory
@@ -304,7 +269,6 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         w27: bool = false,
         w28: bool = false,
         w29: bool = false,
-        w30: bool = false,
 
         lr: bool = false,
         sp: bool = false,
@@ -529,26 +493,44 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         b30: bool = false,
         b31: bool = false,
 
-        za0: bool = false,
-        za1: bool = false,
-        za2: bool = false,
-        za3: bool = false,
-        za4: bool = false,
-        za5: bool = false,
-        za6: bool = false,
-        za7: bool = false,
-        za8: bool = false,
-        za9: bool = false,
-        za10: bool = false,
-        za11: bool = false,
-        za12: bool = false,
-        za13: bool = false,
-        za14: bool = false,
-        za15: bool = false,
+        za0q: bool = false,
+        za1q: bool = false,
+        za2q: bool = false,
+        za3q: bool = false,
+        za4q: bool = false,
+        za5q: bool = false,
+        za6q: bool = false,
+        za7q: bool = false,
+        za8q: bool = false,
+        za9q: bool = false,
+        za10q: bool = false,
+        za11q: bool = false,
+        za12q: bool = false,
+        za13q: bool = false,
+        za14q: bool = false,
+        za15q: bool = false,
+
+        za0d: bool = false,
+        za1d: bool = false,
+        za2d: bool = false,
+        za3d: bool = false,
+        za4d: bool = false,
+        za5d: bool = false,
+        za6d: bool = false,
+        za7d: bool = false,
+
+        za0s: bool = false,
+        za1s: bool = false,
+        za2s: bool = false,
+        za3s: bool = false,
+
+        za0h: bool = false,
+        za1h: bool = false,
+        za0b: bool = false,
 
         zt0: bool = false,
     },
-    .arm, .armeb => packed struct {
+    .arm, .armeb, .thumb, .thumbeb => packed struct {
         /// Whether the inline assembly code may perform stores to memory
         /// addresses other than those derived from input pointer provenance.
         memory: bool = false,
@@ -571,7 +553,6 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         r12: bool = false,
         r13: bool = false,
         r14: bool = false,
-        r15: bool = false,
 
         fpscr: bool = false,
         vpr: bool = false,
@@ -831,6 +812,7 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         a14: bool = false,
         a15: bool = false,
 
+        br: bool = false,
         b0: bool = false,
         b1: bool = false,
         b2: bool = false,
@@ -848,7 +830,6 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
         b14: bool = false,
         b15: bool = false,
 
-        br: bool = false,
         acchi: bool = false,
         acclo: bool = false,
         m0: bool = false,
@@ -999,7 +980,6 @@ pub const Clobbers = switch (@import("builtin").cpu.arch) {
 
         macsr: bool = false,
         acc: bool = false,
-
         acc0: bool = false,
         acc1: bool = false,
         acc2: bool = false,