[PATCH] winebuild: Fix building for arm with older versions of binutils

Martin Storsjö martin at martin.st
Tue Aug 3 04:47:21 CDT 2021


Use an explicit "movw" instead of a plain "mov", as the immediates
might not fit in a narrow thumb mov instruction. Newer versions
of binutils deduces this implicitly.

Signed-off-by: Martin Storsjö <martin at martin.st>
---
 tools/winebuild/spec32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 02029056b30..d944f8179af 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -312,7 +312,7 @@ static void output_relay_debug( DLLSPEC *spec )
             if (has_float) output( "\tvpush {s0-s15}\n" );
             output( "\tpush {LR}\n" );
             output( "\tsub SP, #4\n");
-            output( "\tmov r1,#%u\n", i - spec->base );
+            output( "\tmovw r1,#%u\n", i - spec->base );
             output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset );
             if (UsePIC)
             {
-- 
2.25.1




More information about the wine-devel mailing list