From 0ca4df540f96615e3ea794b307381ba508d35f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 30 Oct 2025 20:28:31 +0100
Subject: [PATCH] std.debug.cpu_context: fix signal_ucontext_t for arm-linux

---
 lib/std/debug/cpu_context.zig | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/std/debug/cpu_context.zig b/lib/std/debug/cpu_context.zig
index 9a0e00d20b..5fa84f9098 100644
--- a/lib/std/debug/cpu_context.zig
+++ b/lib/std/debug/cpu_context.zig
@@ -1609,6 +1609,10 @@ const signal_ucontext_t = switch (native_os) {
         // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/include/uapi/asm-generic/ucontext.h
         .arc,
         .arceb,
+        .arm,
+        .armeb,
+        .thumb,
+        .thumbeb,
         .csky,
         .hexagon,
         .m68k,
@@ -1648,6 +1652,14 @@ const signal_ucontext_t = switch (native_os) {
                     _stop_pc: u32,
                     r30: u32,
                 },
+                // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/arm/include/uapi/asm/sigcontext.h
+                .arm, .armeb, .thumb, .thumbeb => extern struct {
+                    _trap_no: u32,
+                    _error_code: u32,
+                    _oldmask: u32,
+                    r: [15]u32,
+                    pc: u32,
+                },
                 // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/csky/include/uapi/asm/sigcontext.h
                 .csky => extern struct {
                     r31: u32,
@@ -1793,21 +1805,6 @@ const signal_ucontext_t = switch (native_os) {
                 else => unreachable,
             },
         },
-        // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/arm/include/asm/ucontext.h
-        .arm, .armeb, .thumb, .thumbeb => extern struct {
-            _flags: u32,
-            _link: ?*signal_ucontext_t,
-            _stack: std.os.linux.stack_t,
-            _unused: [31]i32,
-            // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/arm/include/uapi/asm/sigcontext.h
-            mcontext: extern struct {
-                _trap_no: u32,
-                _error_code: u32,
-                _oldmask: u32,
-                r: [15]u32,
-                pc: u32,
-            },
-        },
         // https://github.com/torvalds/linux/blob/cd5a0afbdf8033dc83786315d63f8b325bdba2fd/arch/powerpc/include/uapi/asm/ucontext.h
         .powerpc, .powerpcle => extern struct {
             _flags: u32,