ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb.

Without it, Raspbian gcc thinks the next function (raise_func_trampoline_arm) is in Thumb and will create its own trampoline to to execute it as Thumb (bad). Signed-off-by: Mikołaj Zalewski <mikolaj@zalewski.pl> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb.
9014dae8 · Mikołaj Zalewski · Alexandre Julliard · 12a9547e · 9014dae8
Commit 9014dae8 authored Aug 02, 2020 by Mikołaj Zalewski Committed by Alexandre Julliard Aug 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

signal_arm.c dlls/ntdll/unix/signal_arm.c +2 -1

No files found.
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -524,7 +524,8 @@ extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context
 __ASM_GLOBAL_FUNC( raise_func_trampoline_thumb,
                   ".thumb\n\t"
                   "bx r2\n\t"
-                   "bkpt")
+                   "bkpt\n\t"
+                   ".arm")

 extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, void *func );
 __ASM_GLOBAL_FUNC( raise_func_trampoline_arm,