ARMC5 is supported if a target lists ARM as a supported_toolchain

Author: bridadan

tools/build_api.py

@@ -419,8 +419,8 @@ def target_supports_toolchain(target, toolchain_name):
             if(toolchain_name == "ARM"):
                 #we cant find ARM, see if one ARMC5, ARMC6 or uARM listed
                 return any(tc in target.supported_toolchains for tc in ("ARMC5","ARMC6","uARM"))
-            if(toolchain_name == "ARMC6"):
-                #we did not find ARMC6, but check for ARM is listed
+            if(toolchain_name == "ARMC6" or toolchain_name == "ARMC5"):
+                #we did not find ARMC6 or ARMC5, but check if ARM is listed
                 return "ARM" in target.supported_toolchains
         #return False in other cases
         return False

tools/toolchains/arm.py

@@ -400,7 +400,7 @@ def __init__(
         if int(target.build_tools_metadata["version"]) > 0:
             #check only for ARMC5 because ARM_STD means using ARMC5, and thus
             # supported_toolchains must include ARMC5
-            if "ARMC5" not in target.supported_toolchains:
+            if not set(target.supported_toolchains).intersection(set(("ARMC5", "ARM"))):
                 raise NotSupportedException(
                     "ARM compiler 5 support is required for ARM build"
                 )