libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

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
parent 30b9f7e1c0 921e606426
commit 8a23d0ccf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/finsh/shell.c
View File

@ -817,7 +817,7 @@ int finsh_system_init(void)
rt_thread_t tid; rt_thread_t tid;
#ifdef FINSH_USING_SYMTAB #ifdef FINSH_USING_SYMTAB
#if defined(__CC_ARM) || defined(__CLANG_ARM) /* ARM C Compiler */ #ifdef __ARMCC_VERSION /* ARM C Compiler */
extern const int FSymTab$$Base; extern const int FSymTab$$Base;
extern const int FSymTab$$Limit; extern const int FSymTab$$Limit;
extern const int VSymTab$$Base; extern const int VSymTab$$Base;

2
include/libc/libc_signal.h
View File

@ -71,7 +71,7 @@ typedef unsigned long sigset_t;
#include <signal.h> #include <signal.h>
#if defined(__CC_ARM) || defined(__CLANG_ARM) #ifdef __ARMCC_VERSION
#define SIGHUP 1 #define SIGHUP 1
/* #define SIGINT 2 */ /* #define SIGINT 2 */

2
include/rtlibc.h
View File

@ -20,7 +20,7 @@
#include "libc/libc_fdset.h" #include "libc/libc_fdset.h"
#ifndef RT_USING_LIBC #ifndef RT_USING_LIBC
#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__) #if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__)
typedef signed long off_t; typedef signed long off_t;
typedef int mode_t; typedef int mode_t;
#endif #endif

2
include/rtthread.h
View File

@ -566,7 +566,7 @@ rt_size_t rt_strlen(const char *src);
#endif /*RT_KSERVICE_USING_STDLIB*/ #endif /*RT_KSERVICE_USING_STDLIB*/
char *rt_strdup(const char *s); char *rt_strdup(const char *s);
#if defined(__CC_ARM) || defined(__CLANG_ARM) #ifdef __ARMCC_VERSION
/* lack strdup interface */ /* lack strdup interface */
char* strdup(const char* str); char* strdup(const char* str);
#endif #endif

4
src/components.c
View File

@ -134,7 +134,7 @@ void rt_application_init(void);
void rt_hw_board_init(void); void rt_hw_board_init(void);
int rtthread_startup(void); int rtthread_startup(void);
#if defined(__CC_ARM) || defined(__CLANG_ARM) #ifdef __ARMCC_VERSION
extern int $Super$$main(void); extern int $Super$$main(void);
/* re-define main function */ /* re-define main function */
int $Sub$$main(void) int $Sub$$main(void)
@ -183,7 +183,7 @@ void main_thread_entry(void *parameter)
rt_hw_secondary_cpu_up(); rt_hw_secondary_cpu_up();
#endif /* RT_USING_SMP */ #endif /* RT_USING_SMP */
/* invoke system main function */ /* invoke system main function */
#if defined(__CC_ARM) || defined(__CLANG_ARM) #ifdef __ARMCC_VERSION
{ {
extern int $Super$$main(void); extern int $Super$$main(void);
$Super$$main(); /* for ARMCC. */ $Super$$main(); /* for ARMCC. */

2
src/kservice.c
View File

@ -532,7 +532,7 @@ char *rt_strdup(const char *s)
return tmp; return tmp;
} }
RTM_EXPORT(rt_strdup); RTM_EXPORT(rt_strdup);
#if defined(__CC_ARM) || defined(__CLANG_ARM) #ifdef __ARMCC_VERSION
char *strdup(const char *s) __attribute__((alias("rt_strdup"))); char *strdup(const char *s) __attribute__((alias("rt_strdup")));
#endif #endif
#endif /* RT_USING_HEAP */ #endif /* RT_USING_HEAP */