Remove references to GCC_CR from the rest of the tools

pull/8479/head
Brian Daniels 2018-10-02 10:51:54 -05:00 committed by adbridge
parent 648f6d8bca
commit 652147d65b
4 changed files with 6 additions and 6 deletions

View File

@ -292,7 +292,7 @@ def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
Positional arguments: Positional arguments:
src_paths - the paths to source directories src_paths - the paths to source directories
target - ['LPC1768', 'LPC11U24', etc.] target - ['LPC1768', 'LPC11U24', etc.]
toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'GCC_CR'] toolchain_name - ['ARM', 'uARM', 'GCC_ARM', 'IAR']
Keyword arguments: Keyword arguments:
macros - additional macros macros - additional macros

View File

@ -764,7 +764,7 @@ class MemapParser(object):
return output return output
toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "GCC_CR", "IAR"] toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "IAR"]
def compute_report(self): def compute_report(self):
""" Generates summary of memory usage for main areas """ Generates summary of memory usage for main areas
@ -814,7 +814,7 @@ class MemapParser(object):
self.tc_name = toolchain.title() self.tc_name = toolchain.title()
if toolchain in ("ARM", "ARM_STD", "ARM_MICRO", "ARMC6"): if toolchain in ("ARM", "ARM_STD", "ARM_MICRO", "ARMC6"):
parser = _ArmccParser parser = _ArmccParser
elif toolchain == "GCC_ARM" or toolchain == "GCC_CR": elif toolchain == "GCC_ARM":
parser = _GccParser parser = _GccParser
elif toolchain == "IAR": elif toolchain == "IAR":
parser = _IarParser parser = _IarParser

View File

@ -24,7 +24,7 @@ File format example: test_spec.json:
{ {
"targets": { "targets": {
"KL46Z": ["ARM", "GCC_ARM"], "KL46Z": ["ARM", "GCC_ARM"],
"LPC1768": ["ARM", "GCC_ARM", "GCC_CR", "IAR"], "LPC1768": ["ARM", "GCC_ARM", "IAR"],
"LPC11U24": ["uARM"], "LPC11U24": ["uARM"],
"NRF51822": ["ARM"] "NRF51822": ["ARM"]
} }

View File

@ -63,7 +63,7 @@ def benchmarks():
csv_data.writerow(['Toolchain', "Target", "Benchmark", "code", "data", "bss", "flash"]) csv_data.writerow(['Toolchain', "Target", "Benchmark", "code", "data", "bss", "flash"])
# Build # Build
for toolchain in ['ARM', 'uARM', 'GCC_CR', 'GCC_ARM']: for toolchain in ['ARM', 'uARM', 'GCC_ARM']:
for mcu in ["LPC1768", "LPC11U24"]: for mcu in ["LPC1768", "LPC11U24"]:
# Build Libraries # Build Libraries
build_mbed_libs(mcu, toolchain) build_mbed_libs(mcu, toolchain)
@ -118,4 +118,4 @@ def compare(t1, t2, target):
if __name__ == '__main__': if __name__ == '__main__':
compare("GCC_CR", "LPC1768") compare("ARM", "GCC_ARM", "LPC1768")