summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-10-26 23:28:05 +0800
committerruki <[email protected]>2021-10-26 23:28:05 +0800
commitab85e9e49a2e5de91631726efaeb9b12fb6babce (patch)
treec20ee52e054391683bc6cec4b919f1699ac13b2d
parentdea09f243e33b43c8c8be40d8a471b4580db1de7 (diff)
update changelog and readme
-rw-r--r--CHANGELOG.md2
-rw-r--r--README.md2
-rw-r--r--README_zh.md2
3 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35c5e38ad..3243da493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
* [#1765](https://github.com/xmake-io/xmake/issues/1756): Support nim language
* [#1762](https://github.com/xmake-io/xmake/issues/1762): Manage and switch the given package envs for `xrepo env`
* [#1767](https://github.com/xmake-io/xmake/issues/1767): Support Circle compiler
+* [#1753](https://github.com/xmake-io/xmake/issues/1753): Support armcc/armclang toolchains for Keil/MDK
### Changes
@@ -1120,6 +1121,7 @@
* [#1765](https://github.com/xmake-io/xmake/issues/1756): 支持 nim 语言
* [#1762](https://github.com/xmake-io/xmake/issues/1762): 为 `xrepo env` 管理和切换指定的环境配置
* [#1767](https://github.com/xmake-io/xmake/issues/1767): 支持 Circle 编译器
+* [#1753](https://github.com/xmake-io/xmake/issues/1753): 支持 Keil/MDK 的 armcc/armclang 工具链
### 改进
diff --git a/README.md b/README.md
index bd9fa28de..d73b31ff2 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,8 @@ fpc Free Pascal Programming Language Compiler
wasi WASI-enabled WebAssembly C/C++ toolchain
nim Nim Programming Language Compiler
circle A new C++20 compiler
+armcc ARM Compiler Version 5 of Keil MDK
+armclang ARM Compiler Version 6 of Keil MDK
```
## Supported Languages
diff --git a/README_zh.md b/README_zh.md
index ac7941603..0783cf54c 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -235,6 +235,8 @@ fpc Free Pascal Programming Language Compiler
wasi WASI-enabled WebAssembly C/C++ toolchain
nim Nim Programming Language Compiler
circle A new C++20 compiler
+armcc ARM Compiler Version 5 of Keil MDK
+armclang ARM Compiler Version 6 of Keil MDK
```
## 支持语言