grt: split grt-cbinding into grt-cstdio.c and grt-cgnatrts.c

3 files changed, 67 insertions, 43 deletions

diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc
index dd28b21bd..abea76a45 100644
--- a/src/grt/Makefile.inc
+++ b/src/grt/Makefile.inc
@@ -70,9 +70,8 @@ endif
 GRT_FST_OBJS := fstapi.o lz4.o fastlz.o
 
 # Additionnal object files (C or asm files).
-GRT_BASE_C_OBJS:=$(GRT_TARGET_OBJS) grt-cbinding.o
+GRT_BASE_C_OBJS:=$(GRT_TARGET_OBJS) grt-cstdio.o grt-cgnatrts.o
 GRT_ADD_OBJS:=$(GRT_BASE_C_OBJS) grt-cvpi.o grt-cdynload.o $(GRT_FST_OBJS)
-GRT_ADD_SHOBJS:=$(patsubst %, pic/%, $(GRT_ADD_OBJS))
 
 # Source files create by grt.
 GRT_SRC_DEPS:=grt-backtraces-impl.ads
@@ -152,10 +151,16 @@ pic/times.o : $(GRTSRCDIR)/config/times.c
 clock.o : $(GRTSRCDIR)/config/clock.c
 	$(GRT_C_COMPILE)
 
-grt-cbinding.o: $(GRTSRCDIR)/grt-cbinding.c
+grt-cstdio.o: $(GRTSRCDIR)/grt-cstdio.c
 	$(GRT_C_COMPILE)
 
-pic/grt-cbinding.o: $(GRTSRCDIR)/grt-cbinding.c
+pic/grt-cstdio.o: $(GRTSRCDIR)/grt-cstdio.c
+	$(GRT_C_COMPILE_PIC)
+
+grt-cgnatrts.o: $(GRTSRCDIR)/grt-cgnatrts.c
+	$(GRT_C_COMPILE)
+
+pic/grt-cgnatrts.o: $(GRTSRCDIR)/grt-cgnatrts.c
 	$(GRT_C_COMPILE_PIC)
 
 grt-cvpi.o: $(GRTSRCDIR)/grt-cvpi.c
diff --git a/src/grt/grt-cgnatrts.c b/src/grt/grt-cgnatrts.c
new file mode 100644
index 000000000..63f72d742
--- /dev/null
+++ b/src/grt/grt-cgnatrts.c
@@ -0,0 +1,57 @@
+/*  GRT replacements for GNAT rts.
+    Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold.
+
+    GHDL is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2, or (at your option) any later
+    version.
+
+    GHDL is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GCC; see the file COPYING.  If not, write to the Free
+    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+    02111-1307, USA.
+*/
+#include <stdlib.h>
+
+#ifndef WITH_GNAT_RUN_TIME
+void
+__gnat_last_chance_handler (void)
+{
+  abort ();
+}
+
+void *
+__gnat_malloc (size_t size)
+{
+  void *res;
+  res = malloc (size);
+  return res;
+}
+
+void
+__gnat_free (void *ptr)
+{
+  free (ptr);
+}
+
+void *
+__gnat_realloc (void *ptr, size_t size)
+{
+  return realloc (ptr, size);
+}
+
+/* Unused imported symbols with gcc 8.1. */
+int __gnat_binder_ss_count = 0;
+size_t __gnat_default_ss_size = 0;
+void *__gnat_default_ss_pool = NULL;
+
+void
+system__secondary_stack__ss_stackIP (void *t, size_t size)
+{
+}
+#endif
diff --git a/src/grt/grt-cbinding.c b/src/grt/grt-cstdio.c
index 0b4490bbd..31d58be07 100644
--- a/src/grt/grt-cbinding.c
+++ b/src/grt/grt-cstdio.c
@@ -1,4 +1,4 @@
-/*  GRT C bindings.
+/*  GRT C bindings for stdio
     Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold.
 
     GHDL is free software; you can redistribute it and/or modify it under
@@ -87,41 +87,3 @@ feof_unlocked (FILE *stream)
   return feof (stream);
 }
 #endif
-
-#ifndef WITH_GNAT_RUN_TIME
-void
-__gnat_last_chance_handler (void)
-{
-  abort ();
-}
-
-void *
-__gnat_malloc (size_t size)
-{
-  void *res;
-  res = malloc (size);
-  return res;
-}
-
-void
-__gnat_free (void *ptr)
-{
-  free (ptr);
-}
-
-void *
-__gnat_realloc (void *ptr, size_t size)
-{
-  return realloc (ptr, size);
-}
-
-/* Unused imported symbols with gcc 8.1. */
-int __gnat_binder_ss_count = 0;
-size_t __gnat_default_ss_size = 0;
-void *__gnat_default_ss_pool = NULL;
-
-void
-system__secondary_stack__ss_stackIP (void *t, size_t size)
-{
-}
-#endif