Martin Storsjo : winebuild: Spell out "x30" instead of "lr" for arm64.

[Alexandre Julliard]

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

Author: Martin Storsjo <martin(a)martin.st>
Date:   Mon Aug  2 12:00:44 2021 +0300

winebuild: Spell out "x30" instead of "lr" for arm64.

This fixes building with older binutils versions.

Signed-off-by: Martin Storsjo <martin(a)martin.st>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 tools/winebuild/import.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 064ab1b4768..ef12b5fa4b0 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -1772,14 +1772,14 @@ static void output_syscall_dispatcher(void)
         output( "\tstp x4, x5, [sp, #32]\n" );
         output( "\tstp x6, x7, [sp, #48]\n" );
         output( "\tstp x8, x9, [sp, #64]\n" );
-        output( "\tstr lr, [sp, #80]\n" );
+        output( "\tstr x30,    [sp, #80]\n" );
         output( "\tbl %s\n", asm_name("NtCurrentTeb") );
         output( "\tmov x18, x0\n" );
         output( "\tldp x2, x3, [sp, #16]\n" );
         output( "\tldp x4, x5, [sp, #32]\n" );
         output( "\tldp x6, x7, [sp, #48]\n" );
         output( "\tldp x8, x9, [sp, #64]\n" );
-        output( "\tldr lr, [sp, #80]\n" );
+        output( "\tldr x30,    [sp, #80]\n" );
         output( "\tldp x0, x1, [sp], #96\n" );
 
         output( "\tldr x10, [x18, #0x2f8]\n" );  /* arm64_thread_data()->syscall_frame */
@@ -1792,7 +1792,7 @@ static void output_syscall_dispatcher(void)
         output( "\tmov x19, sp\n" );
         output( "\tstp x9, x19, [x10, #0xf0]\n" );
         output( "\tmrs x9, NZCV\n" );
-        output( "\tstp lr, x9, [x10, #0x100]\n" );
+        output( "\tstp x30, x9, [x10, #0x100]\n" );
         output( "\tstr xzr, [x10, #0x110]\n" );  /* frame->restore_flags */
         output( "\tmrs x9, FPCR\n" );
         output( "\tstr w9, [x10, #0x118]\n" );