aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2015-11-22 19:02:05 +0100
committerTristan Gingold <gingold@adacore.com>2015-11-22 19:02:05 +0100
commit27a4852201a41e7d6f8098cc05b7b0949ebc6af4 (patch)
tree91e6effe2be75fedb2e39e2eb374975c5666f206 /dist
parent92b0b82ea32982b94eb8bf19a0b498d92053fffe (diff)
downloadghdl-27a4852201a41e7d6f8098cc05b7b0949ebc6af4.tar.gz
ghdl-27a4852201a41e7d6f8098cc05b7b0949ebc6af4.tar.bz2
ghdl-27a4852201a41e7d6f8098cc05b7b0949ebc6af4.zip
backtrace: add support for windows and for llvm (via libbacktrace).
Diffstat (limited to 'dist')
-rw-r--r--dist/gcc/Makefile.in3
-rw-r--r--dist/mcode/windows/compile.bat56
2 files changed, 36 insertions, 23 deletions
diff --git a/dist/gcc/Makefile.in b/dist/gcc/Makefile.in
index 9430d023c..a51b2a47c 100644
--- a/dist/gcc/Makefile.in
+++ b/dist/gcc/Makefile.in
@@ -104,6 +104,8 @@ GNATMAKE = gnatmake
ADA_CFLAGS = $(CFLAGS)
GHDL_ADAFLAGS = -Wall -gnata
+LIBBACKTRACE = ../../libbacktrace/.libs/libbacktrace.a
+
objext = .o
exeext =
arext = .a
@@ -205,6 +207,7 @@ install-ghdllib:
$(INSTALL_DATA) libgrt.a $(DESTDIR)$(VHDL_LIB_DIR)/libgrt.a
$(INSTALL_DATA) grt.lst $(DESTDIR)$(VHDL_LIB_DIR)/grt.lst
$(INSTALL_DATA) $(GRTSRCDIR)/grt.ver $(DESTDIR)$(VHDL_LIB_DIR)/grt.ver
+ $(INSTALL_DATA) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
# Install VHDL sources.
for d in $(VHDLLIB_SUBDIRS); do \
$(MKDIR) -p $(DESTDIR)$(VHDL_LIB_DIR)/$$d; \
diff --git a/dist/mcode/windows/compile.bat b/dist/mcode/windows/compile.bat
index 95e23b53b..ef9d36252 100644
--- a/dist/mcode/windows/compile.bat
+++ b/dist/mcode/windows/compile.bat
@@ -1,23 +1,33 @@
-mkdir build
-cd build
-
-rem Do the compilation
-set CFLAGS=-O -g
-gcc -c %CFLAGS% ../../../src/grt/grt-cbinding.c
-gcc -c %CFLAGS% ../../../src/grt/grt-cvpi.c
-gcc -c %CFLAGS% ../../../src/grt/config/clock.c
-gcc -c %CFLAGS% ../../../src/ortho/mcode/memsegs_c.c
-gcc -c %CFLAGS% -DWITH_GNAT_RUN_TIME ../../../src/grt/config/win32.c
-gnatmake %CFLAGS% -gnatn -aI../windows -aI../../../src -aI../../../src/ghdldrv -aI../../../src/psl -aI../../../src/grt -aI../../../src/ortho/mcode -aI../../../src/vhdl -aI../../../src/vhdl/translate ghdl_jit -aI../../../src/ortho -o ghdl.exe -largs grt-cbinding.o clock.o grt-cvpi.o memsegs_c.o win32.o -largs -Wl,--stack,8404992
-
-if errorlevel 1 goto failed
-
-strip ghdl.exe
-
-cd ..
-exit /b 0
-
-:failed
-echo "Compilation failed"
-cd ..
-exit /b 1
+mkdir build
+cd build
+
+rem Do the compilation
+set CFLAGS= -O -Wall
+
+gcc -c %CFLAGS% ../../../src/grt/grt-cbinding.c
+if errorlevel 1 goto failed
+
+gcc -c %CFLAGS% ../../../src/grt/grt-cvpi.c
+if errorlevel 1 goto failed
+
+gcc -c %CFLAGS% ../../../src/grt/config/clock.c
+if errorlevel 1 goto failed
+
+gcc -c %CFLAGS% ../../../src/ortho/mcode/memsegs_c.c
+if errorlevel 1 goto failed
+
+gcc -c %CFLAGS% -DWITH_GNAT_RUN_TIME ../../../src/grt/config/win32.c
+if errorlevel 1 goto failed
+
+gnatmake %CFLAGS% -gnatn -aI../windows -aI../../../src -aI../../../src/ghdldrv -aI../../../src/psl -aI../../../src/grt -aI../../../src/ortho/mcode -aI../../../src/vhdl -aI../../../src/vhdl/translate ghdl_jit -aI../../../src/ortho -o ghdl.exe -largs grt-cbinding.o clock.o grt-cvpi.o memsegs_c.o win32.o -ldbghelp -Wl,--stack,8404992
+if errorlevel 1 goto failed
+
+strip ghdl.exe
+
+cd ..
+exit /b 0
+
+:failed
+echo "Compilation failed"
+cd ..
+exit /b 1