diff options
| author | tgingold <tgingold@users.noreply.github.com> | 2016-06-30 19:54:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 19:54:10 +0200 |
| commit | 50d05077aee0a8ff8020d2dcf08a7145fdc74b1e (patch) | |
| tree | 4a20863ad14b0bf810b7c2c00333d9af4084253a /src/grt | |
| parent | ecf964d43cfb36def48809fe47e43f60a5f2e4b1 (diff) | |
| parent | 030a49838de92cb8c2bf77e025cd9ca64314b75b (diff) | |
| download | ghdl-50d05077aee0a8ff8020d2dcf08a7145fdc74b1e.tar.gz ghdl-50d05077aee0a8ff8020d2dcf08a7145fdc74b1e.tar.bz2 ghdl-50d05077aee0a8ff8020d2dcf08a7145fdc74b1e.zip | |
Merge pull request #108 from Paebbels/paebbels/mingw32-mingw64
A first change set for MinGW32 and MinGW64
Diffstat (limited to 'src/grt')
| -rw-r--r-- | src/grt/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/grt/config/win32.c | 4 |
2 files changed, 5 insertions, 4 deletions
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 |