Unverified Commit 747d1c96 by Hein-Pieter van Braam Committed by GitHub

Merge pull request #14723 from hpvb/fix-thekla-ming-32bit-build

Fix 32bit MingW build for thekla_altas
parents a0dd3aba 241de958
......@@ -269,7 +269,7 @@ def configure(env):
if (env["openmp"]):
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(LIBS=['gomp'])
env.Append(LINKFLAGS=['-fopenmp'])
## Compile flags
......
......@@ -394,8 +394,10 @@ namespace
#pragma warning(disable:4748)
static NV_NOINLINE int backtrace(void * trace[], int maxcount) {
CONTEXT ctx = { 0 };
// -- GODOT start --
#if NV_CPU_X86 && !NV_CPU_X86_64
ctx.ContextFlags = CONTEXT_CONTROL;
#if NV_CC_MSVC
_asm {
call x
x: pop eax
......@@ -404,6 +406,13 @@ namespace
mov ctx.Esp, esp
}
#else
register long unsigned int ebp asm("ebp");
ctx.Eip = (DWORD) __builtin_return_address(0);
ctx.Ebp = ebp;
ctx.Esp = (DWORD) __builtin_frame_address(0);
#endif
// -- GODOT end --
#else
RtlCaptureContext(&ctx); // Not implemented correctly in x86.
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment