diff options
| author | Bernard Xiong <[email protected]> | 2013-07-11 15:55:34 -0700 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-07-11 15:55:34 -0700 |
| commit | ba0e1f6f181d00b84dabfa062cc9d0e6380dd16b (patch) | |
| tree | edefffa43e0df536dfab66ce7456e583a7d4741a /bsp | |
| parent | a5a36d3fbffc33fe9978d17d63422411f61059ac (diff) | |
| parent | 02e74583c7cdc71e15764c88dc837dda13c614ac (diff) | |
Merge pull request #128 from prife/sim-init
simulator: update code for new component initialization support on mingw
Diffstat (limited to 'bsp')
| -rwxr-xr-x | bsp/simulator/applications/application.c | 4 | ||||
| -rw-r--r-- | bsp/simulator/mingw.ld | 8 |
2 files changed, 12 insertions, 0 deletions
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 |