Martin Storsjö : winebuild: Fix building for arm with older versions of binutils.

Alexandre Julliard julliard at winehq.org
Tue Aug 3 16:52:23 CDT 2021


Module: wine
Branch: master
Commit: 5de4766475ac606ad917f27ec86154b1406ea9a5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5de4766475ac606ad917f27ec86154b1406ea9a5

Author: Martin Storsjö <martin at martin.st>
Date:   Tue Aug  3 12:47:21 2021 +0300

winebuild: Fix building for arm with older versions of binutils.

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>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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)
             {




More information about the wine-cvs mailing list