Merge pull request #8249 from theotherjimmy/official-tc-support

Tools: Restrict toolchains reported by mbed compile -S to official ones
pull/8489/head
Cruz Monrreal 2018-10-19 14:43:58 -05:00 committed by GitHub
commit c40d86038c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 14 deletions

View File

@ -1072,20 +1072,10 @@ def get_unique_supported_toolchains(release_targets=None):
If release_targets is not specified, then it queries all
known targets
"""
unique_supported_toolchains = []
if not release_targets:
for target in TARGET_NAMES:
for toolchain in TARGET_MAP[target].supported_toolchains:
if toolchain not in unique_supported_toolchains:
unique_supported_toolchains.append(toolchain)
else:
for target in release_targets:
for toolchain in target[1]:
if toolchain not in unique_supported_toolchains:
unique_supported_toolchains.append(toolchain)
return unique_supported_toolchains
return [
name for name, cls in TOOLCHAIN_CLASSES.items()
if cls.OFFICIALLY_SUPPORTED
]
def _lowercase_release_version(release_version):

View File

@ -48,6 +48,8 @@ CPU_COUNT_MIN = 1
CPU_COEF = 1
class mbedToolchain:
OFFICIALLY_SUPPORTED = False
# Verbose logging
VERBOSE = True

View File

@ -337,6 +337,7 @@ class ARM(mbedToolchain):
class ARM_STD(ARM):
OFFICIALLY_SUPPORTED = True
def __init__(self, target, notify=None, macros=None,
build_profile=None, build_dir=None):
ARM.__init__(self, target, notify, macros, build_dir=build_dir,
@ -347,6 +348,7 @@ class ARM_STD(ARM):
class ARM_MICRO(ARM):
PATCHED_LIBRARY = False
OFFICIALLY_SUPPORTED = True
def __init__(self, target, notify=None, macros=None,
silent=False, extra_verbose=False, build_profile=None,
build_dir=None):
@ -357,6 +359,7 @@ class ARM_MICRO(ARM):
raise NotSupportedException("ARM/uARM compiler support is required for ARM build")
class ARMC6(ARM_STD):
OFFICIALLY_SUPPORTED = False
SHEBANG = "#! armclang -E --target=arm-arm-none-eabi -x c"
SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4",
"Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD",

View File

@ -25,6 +25,7 @@ from tools.hooks import hook_tool
from tools.utils import run_cmd, NotSupportedException
class GCC(mbedToolchain):
OFFICIALLY_SUPPORTED = True
LINKER_EXT = '.ld'
LIBRARY_EXT = '.a'

View File

@ -24,6 +24,7 @@ from tools.hooks import hook_tool
from tools.utils import run_cmd, NotSupportedException
class IAR(mbedToolchain):
OFFICIALLY_SUPPORTED = True
LIBRARY_EXT = '.a'
LINKER_EXT = '.icf'
STD_LIB_NAME = "%s.a"