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 #12198 from rajkan01/bug_fix_uARM_depreciate 

uARM: Fix deprecate warning printing wrongly for GCC_ARM/IAR toolchain build
pull/12273/head
Martin Kojtal 2020-01-16 14:43:07 +00:00 committed by GitHub
parent 4cdd8032b5 434f50ec0b
commit cbaa9bd838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/build_api.py
View File

@ -234,17 +234,20 @@ def find_valid_toolchain(target, toolchain):
last_error = None last_error = None
for index, toolchain_name in enumerate(toolchain_names): for index, toolchain_name in enumerate(toolchain_names):
internal_tc_name = get_toolchain_name(target, toolchain_name) internal_tc_name = get_toolchain_name(target, toolchain_name)
if toolchain == "ARM" and toolchain_name == "ARMC5" and index != 0:
end_warnings.append(ARMC5_MIGRATION_WARNING)
if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable(): if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable():
search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set" search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set"
last_error = ( last_error = (
"Could not find executable for {}.\n" "Could not find executable for {}.\n"
"Currently set search path: {}" "Currently set search path: {}"
).format(toolchain_name, search_path) ).format(toolchain_name, search_path)
else: else:
if toolchain_name == "uARM" or target.default_toolchain == "uARM": if toolchain_name == "ARMC5":
end_warnings.append(UARM_TOOLCHAIN_WARNING) end_warnings.append(ARMC5_MIGRATION_WARNING)
if (
toolchain_name in ["uARM", "ARMC5", "ARMC6"]
and "uARM" in {toolchain_name, target.default_toolchain}
):
end_warnings.append(UARM_TOOLCHAIN_WARNING)
return toolchain_name, internal_tc_name, end_warnings return toolchain_name, internal_tc_name, end_warnings
else: else:
if last_error: if last_error:

4
tools/toolchains/arm.py
View File

@ -38,8 +38,8 @@ ARMC5_MIGRATION_WARNING = (
) )
UARM_TOOLCHAIN_WARNING = ( UARM_TOOLCHAIN_WARNING = (
"Warning: We noticed that you are using uARM Toolchain. " "Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. "
"We are deprecating the use of uARM Toolchain. " "We are deprecating the use of the uARM Toolchain. "
"For more information on how to use the ARM toolchain with small C libraries, " "For more information on how to use the ARM toolchain with small C libraries, "
"please visit https://os.mbed.com/docs/mbed-os/latest/reference/using-small-c-libraries.html" "please visit https://os.mbed.com/docs/mbed-os/latest/reference/using-small-c-libraries.html"
) )