From c6786d784e3bf88f6a73b1ac93be7452857c7813 Mon Sep 17 00:00:00 2001 From: ivmai Date: Thu, 19 May 2011 07:50:49 +0000 Subject: [PATCH] 2011-05-19 Ivan Maidanski (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). --- ChangeLog | 11 +++++++++++ include/private/gcconfig.h | 8 +++++--- tests/test.c | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c76b4023..fc728d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-05-19 Ivan Maidanski (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 * include/private/gcconfig.h (MPROTECT_VDB): Enable for Solaris in diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index e2238790..5cd3672d 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -1380,9 +1380,11 @@ # define OS_TYPE "RTEMS" # include 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 b844b63c..e7826c2b 100644 --- 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 -# 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 -- 2.40.0