Skip to content

Commit 2354f76

Browse files
author
Amanda Butler
authored
Merge pull request #682 from theotherjimmy/arm-compiler-switching
Document Arm Compiler switching based on arch version
2 parents 291e110 + 609c9d4 commit 2354f76

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

docs/tools/offline/cli-compile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Image: BUILD/K64F/GCC_ARM/mbed-os-program.bin
3737
The arguments for *compile* are:
3838

3939
- `-m <MCU>` selects a target. If `detect` or `auto` parameter is passed to `-m`, then Mbed CLI detects the connected target.
40-
- `-t <TOOLCHAIN>` selects a toolchain (of those defined in `mbed_settings.py`, see above). The value can be `ARM` (Arm Compiler 5), `GCC_ARM` (GNU Arm Embedded) or `IAR` (IAR Embedded Workbench for Arm).
40+
- `-t <TOOLCHAIN>` selects a toolchain defined in `mbed_settings.py`. The value can be `ARM` (Arm Compiler), `GCC_ARM` (GNU Arm Embedded) or `IAR` (IAR Embedded Workbench for Arm).
41+
<span class="notes">**Note**: `mbed compile -t ARM` selects the Arm Compiler major version based on the Arm architecture version of your target. Arm architecture versions 6 and 7 use Arm Compiler 5, and Arm architecture version 8 uses Arm Compiler 6.</span>
4142
- `--source <SOURCE>` selects the source directory. The default is `.` (the current directory). You can specify multiple source locations, even outside the program tree.
4243
- `--build <BUILD>` selects the build directory. Default: `BUILD/` inside your program root.
4344
<span class="notes">**Note**: `mbed compile` ignores the current build directory; creating multiple build directories leads to errors.</span>

docs/tools/offline/cli-setup.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ For Linux, please [install Mbed CLI manually](installing-manually.html). Advance
2525
- [Git](https://git-scm.com/) - version 1.9.5 or later.
2626
- [Mercurial](https://www.mercurial-scm.org/) - version 2.2.2 or later.
2727

28-
- **Command-line compiler or IDE toolchain:** Mbed CLI invokes the [Mbed OS 5](https://github.com/ARMmbed/mbed-os) tools for various features, such as compiling, testing and exporting to industry standard toolchains. To compile your code, you need either a compiler or an IDE:
29-
- Compilers: Arm GCC, Arm Compiler 5, IAR.
30-
- IDE: Keil uVision, DS-5, IAR Workbench.
28+
- **Command-line compiler:** Mbed CLI invokes the [Mbed OS 5](https://github.com/ARMmbed/mbed-os) tools for various features, such as compiling, testing and exporting to industry standard toolchains. To compile your code, you need one of the following compilers: GCC Arm, Arm Compiler 5, Arm Compiler 6 and IAR.
3129

3230
<span class="notes">**Note:** When installing the Arm Compiler 5 on a 64-bit Linux machine, you may need to also install the i386 architecture package:</span>
3331

0 commit comments

Comments
 (0)