diff options
| author | Bernard Xiong <[email protected]> | 2018-09-23 13:11:34 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-23 13:11:34 +0800 |
| commit | 4ffc675fcbf7c30b58d636a8ec92f1e6fd0054c0 (patch) | |
| tree | a132d93019f1d6d0ac77c2c34b44ad78f757b134 /src | |
| parent | cf13f84c61c9a38458df0fb9c3ed81679e560ba1 (diff) | |
| parent | b98a0ba804f388f531106ff9602eb22ee66fe751 (diff) | |
Merge pull request #1835 from RT-Thread/feature_clang_arm
[Kernel] Add ARMCC 6.x support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/components.c | 4 | ||||
| -rw-r--r-- | src/kservice.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components.c b/src/components.c index 410b20be93..09f0680b55 100644 --- a/src/components.c +++ b/src/components.c @@ -136,7 +136,7 @@ void rt_application_init(void); void rt_hw_board_init(void); int rtthread_startup(void); -#if defined (__CC_ARM) +#if defined(__CC_ARM) || defined(__CLANG_ARM) extern int $Super$$main(void); /* re-define main function */ int $Sub$$main(void) @@ -185,7 +185,7 @@ void main_thread_entry(void *parameter) rt_components_init(); /* invoke system main function */ -#if defined (__CC_ARM) +#if defined(__CC_ARM) || defined(__CLANG_ARM) $Super$$main(); /* for ARMCC. */ #elif defined(__ICCARM__) || defined(__GNUC__) main(); diff --git a/src/kservice.c b/src/kservice.c index a31e5a6f93..e10c093c70 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -525,7 +525,7 @@ char *rt_strdup(const char *s) return tmp; } RTM_EXPORT(rt_strdup); -#ifdef __CC_ARM +#if defined(__CC_ARM) || defined(__CLANG_ARM) char *strdup(const char *s) __attribute__((alias("rt_strdup"))); #endif #endif |