configure and Makefile: link ghdl with grt-cstdio

5 files changed, 13 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 5e431355e..b5ddde46b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -305,9 +305,10 @@ test.gcc:
 
 GHDL_GCC_INCFLAGS=$(GHDL_COMMON_INCFLAGS)
 
-ghdl1-gcc$(EXEEXT): version.ads force
+ghdl1-gcc$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
 	$(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
+	 GNATLFLAGS="$(GRT_SYNTH_OBJS)" \
 	 GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all
 
 ghdl_gcc$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
@@ -318,10 +319,11 @@ ghdl_gcc$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
 libs.vhdl.local_gcc: ghdl_gcc$(EXEEXT) ghdl1-gcc$(EXEEXT)
 	$(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_gcc$(EXEEXT) GHDL_FLAGS="--GHDL1=$(PWD)/ghdl1-gcc$(EXEEXT) $(LIB_CFLAGS)" vhdl.libs.all libs.vhdl.standard
 
-ghdl1-debug$(EXEEXT): version.ads force
+ghdl1-debug$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
 	$(MAKE) -f $(srcdir)/src/ortho/debug/Makefile \
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
 	 GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \
+	 GNATLFLAGS="$(GRT_SYNTH_OBJS)" \
 	 GNATMAKE="$(GNATMAKE)" all
 
 oread-gcc$(EXEEXT): force
@@ -364,10 +366,12 @@ ghdl_llvm$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
 	 ghdl_llvm $(GNAT_BARGS) \
          -largs $(LDFLAGS) $(GRT_SYNTH_OBJS)
 
-ghdl1-llvm$(EXEEXT): version.ads force
+ghdl1-llvm$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force
 	$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
-	 GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	 GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" \
+	 GNATLFLAGS="$(GRT_SYNTH_OBJS)" \
+	 LDFLAGS="$(LDFLAGS)" \
 	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" \
 	 CXXFLAGS="$(COVERAGE_FLAGS) $(CXXFLAGS)" \
 	 GNATMAKE="$(GNATMAKE)" all
diff --git a/scripts/gcc/Make-lang.in b/scripts/gcc/Make-lang.in
index 108b05bdc..a05010e87 100644
--- a/scripts/gcc/Make-lang.in
+++ b/scripts/gcc/Make-lang.in
@@ -51,7 +51,7 @@ vhdl VHDL: ghdl1$(exeext) ghdl$(exeext)
 # Tell GNU Make to ignore these, if they exist.
 .PHONY: vhdl VHDL
 
-GHDL1_OBJS = attribs.o vhdl/ortho-lang.o
+GHDL1_OBJS = attribs.o vhdl/ortho-lang.o vhdl/grt-cstdio.o
 
 # To be put in ALL_HOST_FRONTEND_OBJS, so that generated files are created
 # before.
diff --git a/src/ortho/debug/Makefile b/src/ortho/debug/Makefile
index d7d297c1b..39dbbc113 100644
--- a/src/ortho/debug/Makefile
+++ b/src/ortho/debug/Makefile
@@ -29,7 +29,8 @@ all: $(ortho_exec)
 
 
 $(ortho_exec): force $(ortho_srcdir)/$(BE)/ortho_debug.ads
-	$(GNATMAKE) -o $@ $(GNATMAKE_FLAGS) ortho_debug-main -bargs -E -largs $(LDFLAGS)
+	$(GNATMAKE) -o $@ $(GNATMAKE_FLAGS) ortho_debug-main \
+	 -bargs -E -largs $(LDFLAGS) $(GNATLFLAGS)
 
 clean:
 	$(RM) -f *.o *.ali *~ b~*.ad? ortho_nodes-main
diff --git a/src/ortho/gcc/Makefile b/src/ortho/gcc/Makefile
index 498aa99d0..0849458f8 100644
--- a/src/ortho/gcc/Makefile
+++ b/src/ortho/gcc/Makefile
@@ -68,7 +68,7 @@ LIBS =  $(AGCC_GCCOBJ_DIR)/gcc/libcommon.a \
 $(ortho_exec): $(AGCC_DEPS) $(orthobe_srcdir)/ortho_gcc.ads force
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir) \
 	 -aI$(ortho_srcdir)/gcc $(GNATFLAGS) ortho_gcc-main \
-	 -bargs -E -largs --LINK=$(LINKER) $(AGCC_OBJS) \
+	 -bargs -E -largs --LINK=$(LINKER) $(GNATLFLAGS) $(AGCC_OBJS) \
         $(LDFLAGS) $(BACKEND) $(LIBS) $(BACKENDLIBS)
 
 agcc-clean: force
diff --git a/src/ortho/llvm6/Makefile b/src/ortho/llvm6/Makefile
index 073512817..d5dff6869 100644
--- a/src/ortho/llvm6/Makefile
+++ b/src/ortho/llvm6/Makefile
@@ -13,7 +13,7 @@ all: $(ortho_exec)
 $(ortho_exec): $(ortho_srcdir)/llvm6/ortho_llvm.ads force llvm-cbindings.o
 	$(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm6 -aI$(ortho_srcdir) \
 	$(GNATFLAGS) ortho_code_main -bargs -E \
-	-largs llvm-cbindings.o --LINK=$(CXX) \
+	-largs llvm-cbindings.o $(GNATLFLAGS) --LINK=$(CXX) \
 	`$(LLVM_LDFLAGS)` $(LDFLAGS)
 
 llvm-cbindings.o: $(ortho_srcdir)/llvm6/llvm-cbindings.cpp