Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[armclang] 使用__clang__代替__CLANG_ARM #5451

Merged
merged 2 commits into from
Jan 4, 2022
Merged

[armclang] 使用__clang__代替__CLANG_ARM #5451

merged 2 commits into from
Jan 4, 2022

Conversation

mysterywolf
Copy link
Member

@mysterywolf mysterywolf commented Dec 29, 2021

拉取/合并请求描述:(PR description)

[
移除rtdef.h中的__CLANG_ARM宏定义

用__clang__代替__CLANG_ARM,__CLANG_ARM是我们在rtdef.h里自己定义的宏,使用受限,__clang__是标准的全局宏。
用#ifdef __ARMCC_VERSION代替#if defined(__CC_ARM) || defined(__CLANG_ARM)

#5342 (comment)

]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 本拉取/合并请求代码是高质量的 Code in this PR is of high quality
  • 本拉取/合并使用formatting等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@mysterywolf
Copy link
Member Author

@cndabai 老马麻烦用KEIL AC6测试一下,我没有条件测试AC6 ARMCLANG

@cndabai
Copy link
Contributor

cndabai commented Dec 30, 2021

@cndabai 老马麻烦用KEIL AC6测试一下,我没有条件测试AC6 ARMCLANG

满老师,刚测了俩BSP,没发现问题的

@Guozhanxin
Copy link
Member

@cndabai 老马麻烦用KEIL AC6测试一下,我没有条件测试AC6 ARMCLANG

满老师,刚测了俩BSP,没发现问题的

测试下 clang 的宏生效不

@cndabai
Copy link
Contributor

cndabai commented Dec 30, 2021

@cndabai 老马麻烦用KEIL AC6测试一下,我没有条件测试AC6 ARMCLANG

满老师,刚测了俩BSP,没发现问题的

测试下 clang 的宏生效不
__clang__和__ARMCC_VERSION都生效了

@mysterywolf
Copy link
Member Author

nice

@Guozhanxin Guozhanxin added the +1 Agree +1 label Dec 30, 2021
@Guozhanxin
Copy link
Member

1640834245(1)
就这一个文件报错了,你要不要修一下,满老师?

@mysterywolf
Copy link
Member Author

ok我修一下

@cndabai
Copy link
Contributor

cndabai commented Jan 4, 2022

+2

@mysterywolf mysterywolf added the +2 Agree +2 label Jan 4, 2022
@Guozhanxin Guozhanxin merged commit 05c30fd into RT-Thread:master Jan 4, 2022
@mysterywolf mysterywolf deleted the armcc branch January 4, 2022 10:46
mysterywolf added a commit to mysterywolf/rt-thread that referenced this pull request Aug 15, 2022
Guozhanxin pushed a commit that referenced this pull request Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
+1 Agree +1 +2 Agree +2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants