[1/2] ntdll: Add stub for __chkstk on ARM
André Hentschel
nerv at dawncrow.de
Thu May 28 15:38:53 CDT 2015
---
dlls/kernel32/kernel32.spec | 2 +-
dlls/ntdll/ntdll.spec | 2 +-
dlls/ntdll/signal_arm.c | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 8f6a13e..d5e95c1 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1629,7 +1629,7 @@
@ stdcall WriteTapemark(ptr long long long)
@ stdcall ZombifyActCtx(ptr)
@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
-@ stdcall -arch=x86_64 -private -norelay __chkstk() ntdll.__chkstk
+@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk
@ stub _DebugOut
@ stub _DebugPrintf
@ stdcall _hread(long ptr long)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 6d86157..191115b 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1271,7 +1271,7 @@
@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin
@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr)
-@ stdcall -private -arch=x86_64 -norelay __chkstk()
+@ stdcall -private -arch=arm,x86_64 -norelay __chkstk()
@ cdecl -private __isascii(long) NTDLL___isascii
@ cdecl -private __iscsym(long) NTDLL___iscsym
@ cdecl -private __iscsymf(long) NTDLL___iscsymf
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index bdb27af..fe151d8 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -247,6 +247,14 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext )
FIXME("not implemented\n");
}
+/**************************************************************************
+ * __chkstk (NTDLL.@)
+ *
+ * Should check if we can decrement SP by the value provided in r4, but we shouldn't need that.
+ */
+__ASM_GLOBAL_FUNC( __chkstk,
+ "bx lr\n\t"
+ )
/***********************************************************************
* RtlCaptureContext (NTDLL.@)
--
1.9.1
More information about the wine-patches
mailing list