2011-05-19 Ivan Maidanski <ivmai@mail.ru> (really Jie Liu)

	* include/private/gcconfig.h (end, InitStackBottom): Declare
	extern variable for RTEMS.
	* include/private/gcconfig.h (DATASTART, DATAEND, STACKBOTTOM):
	Update (for RTEMS).
	* include/private/gcconfig.h (DATAEND): Fix a typo in the macro
	name (for RTEMS).
	* tests/test.c (CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER):
	Replace with CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER (for RTEMS).

diff --git a/ChangeLog b/ChangeLog
index c76b4023587d4be66714ffb52ef3f2d60611e141..fc728d084cb01c273a9666c56d246fc02cd2635c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-19  Ivan Maidanski  <ivmai@mail.ru> (really Jie Liu)
+
+       * include/private/gcconfig.h (end, InitStackBottom): Declare
+       extern variable for RTEMS.
+       * include/private/gcconfig.h (DATASTART, DATAEND, STACKBOTTOM):
+       Update (for RTEMS).
+       * include/private/gcconfig.h (DATAEND): Fix a typo in the macro
+       name (for RTEMS).
+       * tests/test.c (CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER):
+       Replace with CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER (for RTEMS).
+
 2011-05-18  Ivan Maidanski  <ivmai@mail.ru>
 
        * include/private/gcconfig.h (MPROTECT_VDB): Enable for Solaris in

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index e22387908748cc982ce74ec5b0726733a7d530ae..5cd3672df229d5f941b547619cd9dcef88be1c93 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -1380,9 +1380,11 @@
 #       define OS_TYPE "RTEMS"
 #       include <sys/unistd.h>
         extern int etext[];
-#       define DATASTART ((ptr_t)((((word) (etext)) + 0xfffff) & ~0xfffff))
-#       define DATAENT   ((ptr_t)(DATASTART + 0xfffff))
-#       define STACKBOTTOM ((ptr_t) 0x03fff000)
+        extern int end[];
+        extern void *InitStackBottom;
+#       define DATASTART ((ptr_t)etext)
+#       define DATAEND ((ptr_t)end)
+#       define STACKBOTTOM ((ptr_t)InitStackBottom)
 #   endif
 #   ifdef DOS4GW
 #     define OS_TYPE "DOS4GW"

diff --git a/tests/test.c b/tests/test.c
index b844b63c1ccd61b3661d4f131b95d5919e30a04b..e7826c2bef27552ea8c93530e73827611c16c6f2 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1393,7 +1393,7 @@ void GC_CALLBACK warn_proc(char *msg, GC_word p)
                        WINMAIN_LPTSTR cmd, int n)
 #elif defined(RTEMS)
 # include <bsp.h>
-# define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
+# define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 # define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 # define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 # define CONFIGURE_MAXIMUM_TASKS 1