From 340e53a65e8175b6d98b11ec2f33461395f722d1 Mon Sep 17 00:00:00 2001
From: ilovapples <ashergrossman185@gmail.com>
Date: Thu, 6 Aug 2026 17:58:56 -0500
Subject: [PATCH] compiler_rt: downgrade ARMv6 Thumb instructions to
 ARMv4-valid variants

---
 lib/compiler_rt/int_from_float.zig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/compiler_rt/int_from_float.zig b/lib/compiler_rt/int_from_float.zig
index 8eb4c2fcbc79f9d254255372062e473443bffdde..20d87eb3f9b927b41a5e59aea8602405ffdb0b58 100644
--- a/lib/compiler_rt/int_from_float.zig
+++ b/lib/compiler_rt/int_from_float.zig
@@ -119,7 +119,7 @@ fn __aeabi_fixsfti(_: compiler_rt.f32.Abi) callconv(.naked) i128 {
     switch (builtin.abi.float()) {
         .soft => asm volatile (
             \\ push {r0-r4, lr}
-            \\ mov r1, r0
+            \\ movs r1, r0
             \\ mov r0, sp
             \\ bl %[__fixsfti]
             \\ pop {r0-r4, pc}
@@ -175,8 +175,8 @@ fn __aeabi_fixdfti(_: compiler_rt.f64.Abi) callconv(.naked) i128 {
     switch (builtin.abi.float()) {
         .soft => asm volatile (
             \\ push {r0-r4, lr}
-            \\ mov r3, r1
-            \\ mov r2, r0
+            \\ movs r3, r1
+            \\ movs r2, r0
             \\ mov r0, sp
             \\ bl %[__fixdfti]
             \\ pop {r0-r4, pc}
@@ -382,7 +382,7 @@ fn __aeabi_fixunssfti(_: compiler_rt.f32.Abi) callconv(.naked) u128 {
     switch (builtin.abi.float()) {
         .soft => asm volatile (
             \\ push {r0-r4, lr}
-            \\ mov r1, r0
+            \\ movs r1, r0
             \\ mov r0, sp
             \\ bl %[__fixunssfti]
             \\ pop {r0-r4, pc}
@@ -438,8 +438,8 @@ fn __aeabi_fixunsdfti(_: compiler_rt.f64.Abi) callconv(.naked) u128 {
     switch (builtin.abi.float()) {
         .soft => asm volatile (
             \\ push {r0-r4, lr}
-            \\ mov r3, r1
-            \\ mov r2, r0
+            \\ movs r3, r1
+            \\ movs r2, r0
             \\ mov r0, sp
             \\ bl %[__fixunsdfti]
             \\ pop {r0-r4, pc}
-- 
2.54.0