From 02e74583c7cdc71e15764c88dc837dda13c614ac Mon Sep 17 00:00:00 2001 From: prife Date: Thu, 11 Jul 2013 23:22:37 +0800 Subject: [PATCH] simulator: update code for new component initialization support on mingw --- bsp/simulator/applications/application.c | 4 ++++ bsp/simulator/mingw.ld | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/bsp/simulator/applications/application.c b/bsp/simulator/applications/application.c index 7aab9f2dbb..4abecb872e 100755 --- a/bsp/simulator/applications/application.c +++ b/bsp/simulator/applications/application.c @@ -30,6 +30,10 @@ void rt_init_thread_entry(void *parameter) /* initialization RT-Thread Components */ rt_components_init(); +#if defined(RT_USING_COMPONENTS_INIT) && defined(__GNUC__) && defined(RT_USING_FINSH) + finsh_set_device(RT_CONSOLE_DEVICE_NAME); +#endif + /* File system Initialization */ #ifdef RT_USING_DFS { diff --git a/bsp/simulator/mingw.ld b/bsp/simulator/mingw.ld index d5ff228fa1..c2159adb51 100644 --- a/bsp/simulator/mingw.ld +++ b/bsp/simulator/mingw.ld @@ -40,6 +40,14 @@ SECTIONS KEEP(*(VSymTab)) ___vsymtab_end = .; __vsymtab_end = .; } + . = ALIGN(__section_alignment__); + rti_fn () : + { + __rt_init_start = .; + KEEP(*(SORT(.rti_fn*))) + __rt_init_end = .; + } + . = ALIGN(__section_alignment__); /* setction information for finsh shell end */ /* The Cygwin32 library uses a section to avoid copying certain data -- GitLab