[Kernel] Add ARMCC 6.x support.

This commit is contained in:
Bernard Xiong
2018-09-23 12:08:44 +08:00
parent cf13f84c61
commit b98a0ba804
12 changed files with 40 additions and 20 deletions
+3 -5
View File
@@ -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);
@@ -16,8 +16,11 @@
#include "rtthread.h"
#ifdef RT_USING_HEAP
#ifdef __CC_ARM
/* avoid the heap and heap-using library functions supplied by arm */
#pragma import(__use_no_heap)
#endif
void *malloc(size_t n)
{
@@ -37,7 +37,11 @@
#include "dfs_posix.h"
#endif
#ifdef __CLANG_ARM
__asm(".global __use_no_semihosting\n\t");
#else
#pragma import(__use_no_semihosting_swi)
#endif
/* Standard IO device handles. */
#define STDIN 0
@@ -46,7 +46,7 @@
#define X32_F "lx"
#ifdef RT_USING_LIBC
#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__)
#include <sys/errno.h>
#else
#include <errno.h>