Skip to content

Commit 64f1928

Browse files
committed
Revert "Add the exception in Mbed OS build tool for Arm Compiler 5 toolchain."
For backwards compatibility reasons, as the Mbed tools must be able to build any online-compiler-supported version of Mbed, revert back to emitting a warning when ARMC5 is used. This will enable ARMC5 to continue working in the online compiler for Mbed OS 5 and other previous versions. ARMC5 remains unsupported in Mbed 6. This reverts commit 03d57b7.
1 parent 9a8c9e2 commit 64f1928

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

tools/build_api.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
4848
from .libraries import Library
4949
from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
50+
from .toolchains.arm import ARMC5_MIGRATION_WARNING
5051
from .toolchains.arm import UARM_TOOLCHAIN_WARNING
5152
from .toolchains.mbed_toolchain import should_replace_small_c_lib
5253
from .config import Config
@@ -244,11 +245,9 @@ def find_valid_toolchain(target, toolchain):
244245
).format(toolchain_name, search_path)
245246
else:
246247
if toolchain_name == "ARMC5":
247-
raise NotSupportedException(
248-
"Arm Compiler 5 is no longer supported, please upgrade to Arm Compiler 6."
249-
)
248+
end_warnings.append(ARMC5_MIGRATION_WARNING)
250249
if (
251-
toolchain_name in ["uARM", "ARMC6"]
250+
toolchain_name in ["uARM", "ARMC5", "ARMC6"]
252251
and "uARM" in {toolchain_name, target.default_toolchain}
253252
):
254253
end_warnings.append(UARM_TOOLCHAIN_WARNING)

tools/toolchains/arm.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@
3232
from tools.utils import mkdir, NotSupportedException, run_cmd
3333
from tools.resources import FileRef
3434

35+
ARMC5_MIGRATION_WARNING = (
36+
"Warning: We noticed that you are using Arm Compiler 5. "
37+
"We are deprecating the use of Arm Compiler 5. "
38+
"Please upgrade your environment to Arm Compiler 6 "
39+
"which is free to use with Mbed OS. For more information, "
40+
"please visit https://os.mbed.com/docs/mbed-os/latest/tools/index.html"
41+
)
42+
3543
UARM_TOOLCHAIN_WARNING = (
3644
"Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. "
3745
"We are deprecating the use of the uARM Toolchain. "

0 commit comments

Comments
 (0)