diff options
| author | David Lin <[email protected]> | 2021-06-24 22:36:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-24 22:36:14 +0800 |
| commit | 6efca1d120aa64b5345e6a0801f23c3fa0e47db4 (patch) | |
| tree | 8644973a5c0d19072a19d8d7f8ebd63dfbbed408 /src | |
| parent | 09b08cca8e5b8c728fb886abc866c22974527b6c (diff) | |
| parent | fcb0a47328a3178d02b3bc0a83bd9e84818e08b7 (diff) | |
Merge branch 'RT-Thread:master' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/components.c | 4 | ||||
| -rwxr-xr-x | src/ipc.c | 2 | ||||
| -rw-r--r-- | src/kservice.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/components.c b/src/components.c index d684d5e6fd..e156b783e4 100644 --- a/src/components.c +++ b/src/components.c @@ -134,7 +134,7 @@ void rt_application_init(void); void rt_hw_board_init(void); int rtthread_startup(void); -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#ifdef __ARMCC_VERSION extern int $Super$$main(void); /* re-define main function */ int $Sub$$main(void) @@ -183,7 +183,7 @@ void main_thread_entry(void *parameter) rt_hw_secondary_cpu_up(); #endif /* RT_USING_SMP */ /* invoke system main function */ -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#ifdef __ARMCC_VERSION { extern int $Super$$main(void); $Super$$main(); /* for ARMCC. */ @@ -588,7 +588,7 @@ rt_err_t rt_mutex_detach(rt_mutex_t mutex) /* wakeup all suspended threads */ rt_ipc_list_resume_all(&(mutex->parent.suspend_thread)); - /* detach semaphore object */ + /* detach mutex object */ rt_object_detach(&(mutex->parent.parent)); return RT_EOK; diff --git a/src/kservice.c b/src/kservice.c index 448b2d717d..49e1486078 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -532,7 +532,7 @@ char *rt_strdup(const char *s) return tmp; } RTM_EXPORT(rt_strdup); -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#ifdef __ARMCC_VERSION char *strdup(const char *s) __attribute__((alias("rt_strdup"))); #endif #endif /* RT_USING_HEAP */ |