mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-09-21 10:36:04 +08:00
Merge pull request #4796 from mysterywolf/__CLANG_ARM
将defined(__CC_ARM) || defined(__CLANG_ARM) 改为 ifdef __ARMCC_VERSION
This commit is contained in:
+2
-2
@@ -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
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user