2011-04-09 Ivan Maidanski <ivmai@mail.ru>

	* os_dep.c (GC_unix_sbrk_get_mem, GC_unix_get_mem): Don't define
	for RTEMS.
	* include/private/gcconfig.h (RTEMS): Add support for.
	* include/private/gcconfig.h (GET_MEM): Use calloc() for RTEMS.

diff --git a/ChangeLog b/ChangeLog
index a8cd985d1362a70f9a0045c4276d35879eeac185..ec8e719a8d754d7466656ad94d3af43ccde85d0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-09  Ivan Maidanski  <ivmai@mail.ru>
+
+       * os_dep.c (GC_unix_sbrk_get_mem, GC_unix_get_mem): Don't define
+       for RTEMS.
+       * include/private/gcconfig.h (RTEMS): Add support for.
+       * include/private/gcconfig.h (GET_MEM): Use calloc() for RTEMS.
+
 2011-04-09  Ivan Maidanski  <ivmai@mail.ru>
 
        * mallocx.c (GC_malloc_uncollectable): Move to malloc.c (since

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 06c35d86d31fc428f8ec44fbf79f275b04309890..051391a3757625501dd2ff151f6c7eff7648b75e 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -338,6 +338,11 @@
 #    define DARWIN_DONT_PARSE_STACK
 #   endif
 # endif
+# if defined(__rtems__) && (defined(i386) || defined(__i386__))
+#   define I386
+#   define RTEMS
+#   define mach_type_known
+# endif
 # if defined(NeXT) && defined(mc68000)
 #   define M68K
 #   define NEXT
@@ -1373,6 +1378,13 @@
 #       define STACKBOTTOM ((ptr_t)0xc0000000)
 #       define DATAEND  /* not needed */
 #   endif
+#   ifdef RTEMS
+#       define OS_TYPE "RTEMS"
+        extern int etext[];
+#       define DATASTART ((ptr_t)((((word) (etext)) + 0xfffff) & ~0xfffff))
+#       define DATAENT   ((ptr_t)(DATASTART + 0xfffff))
+#       define STACKBOTTOM ((ptr_t) 0x03fff000)
+#   endif
 #   ifdef DOS4GW
 #     define OS_TYPE "DOS4GW"
       extern long __nullarea;
@@ -2649,11 +2661,12 @@
 #   define GET_MEM(bytes) HBLKPTR((ptr_t)os2_alloc((size_t)bytes \
                                             + GC_page_size) \
                                             + GC_page_size-1)
-# elif defined(NEXT) || defined(DOS4GW) || defined(NONSTOP) || \
-                 (defined(AMIGA) && !defined(GC_AMIGA_FASTALLOC)) || \
-                 (defined(SOLARIS) && !defined(USE_MMAP))
-#   define GET_MEM(bytes) HBLKPTR((size_t) calloc(1, (size_t)bytes + GC_page_size) \
-                                  + GC_page_size-1)
+# elif defined(NEXT) || defined(DOS4GW) || defined(NONSTOP) \
+        || (defined(AMIGA) && !defined(GC_AMIGA_FASTALLOC)) \
+        || (defined(SOLARIS) && !defined(USE_MMAP)) || defined(RTEMS)
+#   define GET_MEM(bytes) HBLKPTR((size_t)calloc(1, \
+                                              (size_t)bytes + GC_page_size) \
+                                  + GC_page_size - 1)
 # elif defined(MSWIN32) || defined(CYGWIN32)
     ptr_t GC_win32_get_mem(GC_word bytes);
 #   define GET_MEM(bytes) (struct hblk *)GC_win32_get_mem(bytes)

diff --git a/os_dep.c b/os_dep.c
index 3bb778c1f5b0de492a8f3af748cb713af64982fd..9fa42a5bfddf48e8711f70fcdee1648c13651123 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -2010,7 +2010,7 @@ void GC_register_data_segments(void)
 
 # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
      && !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \
-     && !defined(NONSTOP) && !defined(SN_TARGET_PS3)
+     && !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS)
 
 # define SBRK_ARG_T ptrdiff_t