ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12400 from rajkan01/armc5_build_tool_exception 

Add an exception for ARMC5 toolchain build
pull/12408/head
Martin Kojtal 2020-02-11 14:05:12 +00:00 committed by GitHub
parent c1eaf2c358 03d57b7ba2
commit bb86c0e4d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build_api.py
View File

@ -46,7 +46,6 @@ from .notifier.mock import MockNotifier
from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
from .libraries import Library from .libraries import Library
from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
from .toolchains.arm import ARMC5_MIGRATION_WARNING
from .toolchains.arm import UARM_TOOLCHAIN_WARNING from .toolchains.arm import UARM_TOOLCHAIN_WARNING
from .config import Config from .config import Config
@ -242,9 +241,11 @@ def find_valid_toolchain(target, toolchain):
).format(toolchain_name, search_path) ).format(toolchain_name, search_path)
else: else:
if toolchain_name == "ARMC5": if toolchain_name == "ARMC5":
end_warnings.append(ARMC5_MIGRATION_WARNING) raise NotSupportedException(
"Arm Compiler 5 is no longer supported, please upgrade to Arm Compiler 6."
)
if ( if (
toolchain_name in ["uARM", "ARMC5", "ARMC6"] toolchain_name in ["uARM", "ARMC6"]
and "uARM" in {toolchain_name, target.default_toolchain} and "uARM" in {toolchain_name, target.default_toolchain}
): ):
end_warnings.append(UARM_TOOLCHAIN_WARNING) end_warnings.append(UARM_TOOLCHAIN_WARNING)

8
tools/toolchains/arm.py
View File

@ -29,14 +29,6 @@ from tools.toolchains.mbed_toolchain import mbedToolchain, TOOLCHAIN_PATHS
from tools.utils import mkdir, NotSupportedException, run_cmd from tools.utils import mkdir, NotSupportedException, run_cmd
from tools.resources import FileRef from tools.resources import FileRef
ARMC5_MIGRATION_WARNING = (
"Warning: We noticed that you are using Arm Compiler 5. "
"We are deprecating the use of Arm Compiler 5. "
"Please upgrade your environment to Arm Compiler 6 "
"which is free to use with Mbed OS. For more information, "
"please visit https://os.mbed.com/docs/mbed-os/latest/tools/index.html"
)
UARM_TOOLCHAIN_WARNING = ( UARM_TOOLCHAIN_WARNING = (
"Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. " "Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. "
"We are deprecating the use of the uARM Toolchain. " "We are deprecating the use of the uARM Toolchain. "