From 030a49838de92cb8c2bf77e025cd9ca64314b75b Mon Sep 17 00:00:00 2001
From: Patrick Lehmann <Patrick.Lehmann@tu-dresden.de>
Date: Thu, 30 Jun 2016 14:05:18 +0200
Subject: A first changeset for MinGW32 and MinGW64 to compile GHDL with mcode
 and llvm backend on Windows x86-64.

---
 src/grt/Makefile.inc   | 5 +++--
 src/grt/config/win32.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/grt')

diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc
index f8a4d327a..7ac0c96d2 100644
--- a/src/grt/Makefile.inc
+++ b/src/grt/Makefile.inc
@@ -47,8 +47,9 @@ endif
 GRT_ELF_OPTS:=-Wl,--version-script=@/grt.ver -Wl,--export-dynamic
 
 # Set target files.
-ifeq ($(filter-out mingw32,$(osys)),)
-  GRT_TARGET_OBJS=jumps.o math.o clock.o
+ifeq ($(filter-out mingw32 mingw64,$(osys)),)
+  GRT_TARGET_OBJS=win32.o clock.o
+  GRT_EXTRA_LIB=-ldbghelp
 else
   GRT_TARGET_OBJS=jumps.o times.o
   ifeq ($(filter-out linux,$(osys)),)
diff --git a/src/grt/config/win32.c b/src/grt/config/win32.c
index 79935e6f0..c473b246c 100644
--- a/src/grt/config/win32.c
+++ b/src/grt/config/win32.c
@@ -79,9 +79,9 @@ get_bt_from_context (struct backtrace_addrs *bt, CONTEXT *ctxt, int skip)
 
   frame.AddrPC.Offset = ctxt->Rip;
   frame.AddrPC.Mode = AddrModeFlat;
-  frame.AddrFrame.Offset = ctx->Rsp;
+  frame.AddrFrame.Offset = ctxt->Rsp;
   frame.AddrFrame.Mode = AddrModeFlat;
-  frame.AddrStack.Offset = ctx->Rsp;
+  frame.AddrStack.Offset = ctxt->Rsp;
   frame.AddrStack.Mode = AddrModeFlat;
 
 #else
-- 
cgit v1.2.3