Merge pull request #4796 from mysterywolf/__CLANG_ARM

将defined(__CC_ARM) || defined(__CLANG_ARM) 改为 ifdef __ARMCC_VERSION
This commit is contained in:
Bernard Xiong
2021-06-24 21:05:05 +08:00
committed by GitHub
6 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -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. */
+1 -1
View File
@@ -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 */