Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76519099
rt-thread
提交
4ffc675f
R
rt-thread
项目概览
2301_76519099
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
3
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4ffc675f
编写于
9月 23, 2018
作者:
B
Bernard Xiong
提交者:
GitHub
9月 23, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1835 from RT-Thread/feature_clang_arm
[Kernel] Add ARMCC 6.x support.
上级
cf13f84c
b98a0ba8
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
40 addition
and
20 deletion
+40
-20
components/finsh/shell.c
components/finsh/shell.c
+3
-5
components/libc/compilers/armlibc/mem_std.c
components/libc/compilers/armlibc/mem_std.c
+3
-0
components/libc/compilers/armlibc/stubs.c
components/libc/compilers/armlibc/stubs.c
+4
-0
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
+1
-1
include/libc/libc_signal.h
include/libc/libc_signal.h
+1
-1
include/rtdef.h
include/rtdef.h
+7
-2
include/rtlibc.h
include/rtlibc.h
+1
-1
include/rtthread.h
include/rtthread.h
+1
-1
libcpu/arm/cortex-m4/cpuport.c
libcpu/arm/cortex-m4/cpuport.c
+8
-3
libcpu/arm/cortex-m7/cpuport.c
libcpu/arm/cortex-m7/cpuport.c
+8
-3
src/components.c
src/components.c
+2
-2
src/kservice.c
src/kservice.c
+1
-1
未找到文件。
components/finsh/shell.c
浏览文件 @
4ffc675f
...
...
@@ -55,7 +55,9 @@
static
struct
rt_thread
finsh_thread
;
ALIGN
(
RT_ALIGN_SIZE
)
static
char
finsh_thread_stack
[
FINSH_THREAD_STACK_SIZE
];
struct
finsh_shell
_shell
;
#endif
struct
finsh_shell
*
shell
;
static
char
*
finsh_prompt_custom
=
RT_NULL
;
...
...
@@ -473,9 +475,6 @@ static void shell_push_history(struct finsh_shell *shell)
}
#endif
#ifndef RT_USING_HEAP
struct
finsh_shell
_shell
;
#endif
void
finsh_thread_entry
(
void
*
parameter
)
{
char
ch
;
...
...
@@ -792,7 +791,7 @@ int finsh_system_init(void)
rt_thread_t
tid
;
#ifdef FINSH_USING_SYMTAB
#if
def __CC_ARM
/* ARM C Compiler */
#if
defined(__CC_ARM) || defined(__CLANG_ARM)
/* ARM C Compiler */
extern
const
int
FSymTab
$$
Base
;
extern
const
int
FSymTab
$$
Limit
;
extern
const
int
VSymTab
$$
Base
;
...
...
@@ -867,4 +866,3 @@ int finsh_system_init(void)
return
0
;
}
INIT_APP_EXPORT
(
finsh_system_init
);
components/libc/compilers/armlibc/mem_std.c
浏览文件 @
4ffc675f
...
...
@@ -16,8 +16,11 @@
#include "rtthread.h"
#ifdef RT_USING_HEAP
#ifdef __CC_ARM
/* avoid the heap and heap-using library functions supplied by arm */
#pragma import(__use_no_heap)
#endif
void
*
malloc
(
size_t
n
)
{
...
...
components/libc/compilers/armlibc/stubs.c
浏览文件 @
4ffc675f
...
...
@@ -37,7 +37,11 @@
#include "dfs_posix.h"
#endif
#ifdef __CLANG_ARM
__asm
(
".global __use_no_semihosting
\n\t
"
);
#else
#pragma import(__use_no_semihosting_swi)
#endif
/* Standard IO device handles. */
#define STDIN 0
...
...
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
浏览文件 @
4ffc675f
...
...
@@ -46,7 +46,7 @@
#define X32_F "lx"
#ifdef RT_USING_LIBC
#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
#if defined(__CC_ARM) || defined(__
CLANG_ARM) || defined(__
IAR_SYSTEMS_ICC__)
#include <sys/errno.h>
#else
#include <errno.h>
...
...
include/libc/libc_signal.h
浏览文件 @
4ffc675f
...
...
@@ -71,7 +71,7 @@ typedef struct siginfo siginfo_t;
#include <sys/signal.h>
#endif
#if
def __CC_ARM
#if
defined(__CC_ARM) || defined(__CLANG_ARM)
#include <signal.h>
typedef
unsigned
long
sigset_t
;
...
...
include/rtdef.h
浏览文件 @
4ffc675f
...
...
@@ -88,14 +88,19 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_UINT32_MAX 0xffffffff
/**< Maxium number of UINT32 */
#define RT_TICK_MAX RT_UINT32_MAX
/**< Maxium number of tick */
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
#define __CLANG_ARM
#endif
/* Compiler Related Definitions */
#if
def __CC_ARM
/* ARM Compiler */
#if
defined(__CC_ARM) || defined(__CLANG_ARM)
/* ARM Compiler */
#include <stdarg.h>
#define SECTION(x) __attribute__((section(x)))
#define RT_UNUSED __attribute__((unused))
#define RT_USED __attribute__((used))
#define ALIGN(n) __attribute__((aligned(n)))
#define RT_WEAK __weak
#define RT_WEAK __attribute__((weak))
#define rt_inline static __inline
/* module compiling */
#ifdef RT_USING_MODULE
...
...
include/rtlibc.h
浏览文件 @
4ffc675f
...
...
@@ -25,7 +25,7 @@
#include "libc/libc_signal.h"
#include "libc/libc_fdset.h"
#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
#if defined(__CC_ARM) || defined(__
CLANG_ARM) || defined(__
IAR_SYSTEMS_ICC__)
typedef
signed
long
off_t
;
typedef
int
mode_t
;
#endif
...
...
include/rtthread.h
浏览文件 @
4ffc675f
...
...
@@ -501,7 +501,7 @@ rt_int32_t rt_strncmp(const char *cs, const char *ct, rt_ubase_t count);
rt_int32_t
rt_strcmp
(
const
char
*
cs
,
const
char
*
ct
);
rt_size_t
rt_strlen
(
const
char
*
src
);
char
*
rt_strdup
(
const
char
*
s
);
#if
def __CC_ARM
#if
defined(__CC_ARM) || defined(__CLANG_ARM)
/* leak strdup interface */
char
*
strdup
(
const
char
*
str
);
#endif
...
...
libcpu/arm/cortex-m4/cpuport.c
浏览文件 @
4ffc675f
...
...
@@ -22,9 +22,14 @@
#include <rtthread.h>
#define USE_FPU
/* ARMCC */
( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* IAR */
|| (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
#if
/* ARMCC */
( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* Clang */
|| (defined ( __CLANG_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* IAR */
|| (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* GNU */
|| (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
#define USE_FPU 1
#else
#define USE_FPU 0
#endif
/* exception and interrupt handler table */
rt_uint32_t
rt_interrupt_from_thread
;
...
...
@@ -452,7 +457,7 @@ RT_WEAK void rt_hw_cpu_reset(void)
* @return return the index of the first bit set. If value is 0, then this function
* shall return 0.
*/
#if defined(__CC_ARM)
#if defined(__CC_ARM)
|| defined(__CLANG_ARM)
__asm
int
__rt_ffs
(
int
value
)
{
CMP
r0
,
#
0x00
...
...
libcpu/arm/cortex-m7/cpuport.c
浏览文件 @
4ffc675f
...
...
@@ -22,9 +22,14 @@
#include <rtthread.h>
#define USE_FPU
/* ARMCC */
( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* IAR */
|| (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
#if
/* ARMCC */
( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* Clang */
|| (defined ( __CLANG_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* IAR */
|| (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* GNU */
|| (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
#define USE_FPU 1
#else
#define USE_FPU 0
#endif
/* exception and interrupt handler table */
rt_uint32_t
rt_interrupt_from_thread
;
...
...
@@ -452,7 +457,7 @@ RT_WEAK void rt_hw_cpu_reset(void)
* @return return the index of the first bit set. If value is 0, then this function
* shall return 0.
*/
#if defined(__CC_ARM)
#if defined(__CC_ARM)
|| defined(__CLANG_ARM)
__asm
int
__rt_ffs
(
int
value
)
{
CMP
r0
,
#
0x00
...
...
src/components.c
浏览文件 @
4ffc675f
...
...
@@ -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
();
...
...
src/kservice.c
浏览文件 @
4ffc675f
...
...
@@ -525,7 +525,7 @@ char *rt_strdup(const char *s)
return
tmp
;
}
RTM_EXPORT
(
rt_strdup
);
#if
def __CC_ARM
#if
defined(__CC_ARM) || defined(__CLANG_ARM)
char
*
strdup
(
const
char
*
s
)
__attribute__
((
alias
(
"rt_strdup"
)));
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录