From d9e11f4f3143e5739c5444302d4e7f4701a86d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sun, 9 Aug 2026 05:15:57 +0200
Subject: [PATCH] std.debug.cpu_context.Arm: make current assembly work in
 Thumb-1

---
 lib/std/debug/cpu_context.zig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/std/debug/cpu_context.zig b/lib/std/debug/cpu_context.zig
index 5a4cfb32cef8bda3afa6c489dd1be1453b67769e..6cd81d2575b0366c5af3064d292070fdee039009 100644
--- a/lib/std/debug/cpu_context.zig
+++ b/lib/std/debug/cpu_context.zig
@@ -464,10 +464,11 @@ const Arm = struct {
             \\ stm r0, {r0-r12}
             \\ str r13, [r0, #0x34]
             \\ str r14, [r0, #0x38]
-            \\ str r15, [r0, #0x3c]
+            \\ mov r1, pc
+            \\ str r1, [r0, #0x3c]
             :
             : [r] "{r0}" (&ctx.r),
-            : .{ .memory = true });
+            : .{ .r1 = true, .memory = true });
         return ctx;
     }
 
-- 
2.54.0