[2/2] ntdll: Fix returning from various ARM assembler functions

André Hentschel nerv at dawncrow.de
Thu May 28 15:39:01 CDT 2015


---
 dlls/ntdll/signal_arm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index fe151d8..782ab46 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -285,7 +285,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4,
                     "str PC, [r0, #0x40]\n\t"  /* context->Pc */
                     "mrs r1, CPSR\n\t"
                     "str r1, [r0, #0x44]\n\t"  /* context->Cpsr */
-                    "mov PC, LR\n"
+                    "bx lr\n"
                     )
 
 
@@ -922,7 +922,7 @@ void signal_free_thread( TEB *teb )
 extern void set_tpidrurw( TEB *teb );
 __ASM_GLOBAL_FUNC( set_tpidrurw,
                    "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */
-                   "blx lr" )
+                   "bx lr" )
 #else
 void set_tpidrurw( TEB *teb )
 {
-- 
1.9.1




More information about the wine-patches mailing list