uARM: Fix deprecate warning printing wrongly for other toolchains.

tools/build_api.py

@@ -47,7 +47,7 @@ from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
 from .libraries import Library
 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, UARM_DEFAULT_TOOLCHAIN_WARNING
 from .config import Config
 
 RELEASE_VERSIONS = ['2', '5']
@@ -234,8 +234,10 @@ def find_valid_toolchain(target, toolchain):
     last_error = None
     for index, toolchain_name in enumerate(toolchain_names):
         internal_tc_name = get_toolchain_name(target, toolchain_name)
-        if toolchain == "ARM" and toolchain_name == "ARMC5" and index != 0:
+        if toolchain_name == "ARMC5":
             end_warnings.append(ARMC5_MIGRATION_WARNING)
+            if target.default_toolchain == "uARM":
+                end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING)
         if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable():
             search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set"
             last_error = (
@@ -243,8 +245,10 @@ def find_valid_toolchain(target, toolchain):
                 "Currently set search path: {}"
             ).format(toolchain_name, search_path)
         else:
-            if toolchain_name == "uARM" or target.default_toolchain == "uARM":
-                 end_warnings.append(UARM_TOOLCHAIN_WARNING)
+            if toolchain_name == "uARM":
+                end_warnings.append(UARM_TOOLCHAIN_WARNING)
+            elif toolchain_name == "ARMC6" and target.default_toolchain == "uARM":                
+                end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING)
             return toolchain_name, internal_tc_name, end_warnings
     else:
         if last_error:

tools/toolchains/arm.py

@@ -44,6 +44,13 @@ UARM_TOOLCHAIN_WARNING = (
     "please visit https://os.mbed.com/docs/mbed-os/latest/reference/using-small-c-libraries.html"
 )
 
+UARM_DEFAULT_TOOLCHAIN_WARNING = (
+    "Warning: We noticed that this target default_toolchain overrides --toolchain option with uARM Toolchain. "
+    "We are deprecating the use of uARM Toolchain. "
+    "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"
+)
+
 class ARM(mbedToolchain):
     LINKER_EXT = '.sct'
     LIBRARY_EXT = '.ar'