diff options
| author | Meco Man <[email protected]> | 2021-02-11 09:45:49 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-11 09:45:49 -0600 |
| commit | f0805a7973ffe62e459da7748cbada62bccf98b9 (patch) | |
| tree | 9150992340323657482d81a2bedd9497e9d429ab /src | |
| parent | 852d7d7552bd3fe898115ea16ba401970b0d1fad (diff) | |
| parent | a4dd106d49667aed3ca5e7a7fa3ef8f650070f45 (diff) | |
Merge pull request #16 from RT-Thread/master
pr
Diffstat (limited to 'src')
| -rw-r--r-- | src/components.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components.c b/src/components.c index e7824b65ef..8ea5654d0c 100644 --- a/src/components.c +++ b/src/components.c @@ -173,19 +173,22 @@ struct rt_thread main_thread; void main_thread_entry(void *parameter) { extern int main(void); - extern int $Super$$main(void); #ifdef RT_USING_COMPONENTS_INIT /* RT-Thread components initialization */ rt_components_init(); #endif + #ifdef RT_USING_SMP rt_hw_secondary_cpu_up(); #endif /* invoke system main function */ #if defined(__CC_ARM) || defined(__CLANG_ARM) - $Super$$main(); /* for ARMCC. */ -#elif defined(__ICCARM__) || defined(__GNUC__) + { + extern int $Super$$main(void); + $Super$$main(); /* for ARMCC. */ + } +#elif defined(__ICCARM__) || defined(__GNUC__) || defined(__TASKING__) main(); #endif } |