diff options
| author | Bernard Xiong <[email protected]> | 2018-09-23 12:08:44 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2018-09-23 12:08:44 +0800 |
| commit | b98a0ba804f388f531106ff9602eb22ee66fe751 (patch) | |
| tree | a132d93019f1d6d0ac77c2c34b44ad78f757b134 /components/finsh/shell.c | |
| parent | cf13f84c61c9a38458df0fb9c3ed81679e560ba1 (diff) | |
[Kernel] Add ARMCC 6.x support.
Diffstat (limited to 'components/finsh/shell.c')
| -rw-r--r-- | components/finsh/shell.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/components/finsh/shell.c b/components/finsh/shell.c index ccd5b97306..441f6c3241 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -55,7 +55,9 @@ static struct rt_thread finsh_thread; ALIGN(RT_ALIGN_SIZE) static char finsh_thread_stack[FINSH_THREAD_STACK_SIZE]; +struct finsh_shell _shell; #endif + struct finsh_shell *shell; static char *finsh_prompt_custom = RT_NULL; @@ -473,9 +475,6 @@ static void shell_push_history(struct finsh_shell *shell) } #endif -#ifndef RT_USING_HEAP -struct finsh_shell _shell; -#endif void finsh_thread_entry(void *parameter) { char ch; @@ -792,7 +791,7 @@ int finsh_system_init(void) rt_thread_t tid; #ifdef FINSH_USING_SYMTAB -#ifdef __CC_ARM /* ARM C Compiler */ +#if defined(__CC_ARM) || defined(__CLANG_ARM) /* ARM C Compiler */ extern const int FSymTab$$Base; extern const int FSymTab$$Limit; extern const int VSymTab$$Base; @@ -867,4 +866,3 @@ int finsh_system_init(void) return 0; } INIT_APP_EXPORT(finsh_system_init); - |