Disable Arm Compiler 5 and Use Arm Compiler 6 by default

Author: theotherjimmy

tools/profiles/debug.json

@@ -15,7 +15,7 @@
                "-Wl,--wrap,_calloc_r", "-Wl,--wrap,exit", "-Wl,--wrap,atexit",
                "-Wl,-n"]
     },
-    "ARMC6": {
+    "ARM": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-g", "-O0",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
@@ -26,27 +26,6 @@
         "ld": ["--verbose", "--remove", "--legacyalign", "--no_strict_wchar_size",
                "--no_strict_enum_size"]
     },
-    "ARM": {
-        "common": ["-c", "--gnu", "-Otime", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O0", "-g", "-DMBED_DEBUG",
-                   "-DMBED_TRAP_ERRORS_ENABLED=1"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
-    },
-    "uARM": {
-        "common": ["-c", "--gnu", "-Otime", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O0", "-D__MICROLIB", "-g",
-                   "--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-DMBED_DEBUG",
-                   "-DMBED_TRAP_ERRORS_ENABLED=1"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--library_type=microlib"]
-    },
     "IAR": {
         "common": [
             "--no_wrap_diagnostics",  "-e",

tools/profiles/develop.json

@@ -14,7 +14,7 @@
                "-Wl,--wrap,_calloc_r", "-Wl,--wrap,exit", "-Wl,--wrap,atexit",
                "-Wl,-n"]
     },
-    "ARMC6": {
+    "ARM": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Os",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
@@ -24,25 +24,6 @@
         "cxx": ["-fno-rtti", "-std=gnu++98"],
         "ld": ["--legacyalign", "--no_strict_wchar_size", "--no_strict_enum_size"]
     },
-    "ARM": {
-        "common": ["-c", "--gnu", "-Otime", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O3"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
-    },
-    "uARM": {
-        "common": ["-c", "--gnu", "-Otime", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O3", "-D__MICROLIB",
-                   "--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--library_type=microlib"]
-    },
     "IAR": {
         "common": [
             "--no_wrap_diagnostics", "-e",

tools/profiles/release.json

@@ -14,7 +14,7 @@
                "-Wl,--wrap,_calloc_r", "-Wl,--wrap,exit", "-Wl,--wrap,atexit",
                "-Wl,-n"]
     },
-    "ARMC6": {
+    "ARM": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Oz",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
@@ -24,25 +24,6 @@
         "cxx": ["-fno-rtti", "-std=gnu++98"],
         "ld": ["--legacyalign", "--no_strict_wchar_size", "--no_strict_enum_size"]
     },
-    "ARM": {
-        "common": ["-c", "--gnu", "-Ospace", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O3", "-DNDEBUG"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
-    },
-    "uARM": {
-        "common": ["-c", "--gnu", "-Ospace", "--split_sections",
-                   "--apcs=interwork", "--brief_diagnostics", "--restrict",
-                   "--multibyte_chars", "-O3", "-D__MICROLIB",
-                   "--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-DNDEBUG"],
-        "asm": [],
-        "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
-        "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--library_type=microlib"]
-    },
     "IAR": {
         "common": [
             "--no_wrap_diagnostics", "-e",

tools/toolchains/__init__.py

@@ -1572,7 +1572,6 @@ def report(self):
 
 TOOLCHAIN_PATHS = {
     'ARM': ARM_PATH,
-    'uARM': ARM_PATH,
     'ARMC6': ARMC6_PATH,
     'GCC_ARM': GCC_ARM_PATH,
     'IAR': IAR_PATH
@@ -1583,9 +1582,7 @@ def report(self):
 from tools.toolchains.iar import IAR
 
 TOOLCHAIN_CLASSES = {
-    'ARM': ARM_STD,
-    'uARM': ARM_MICRO,
-    'ARMC6': ARMC6,
+    'ARM': ARMC6,
     'GCC_ARM': GCC_ARM,
     'IAR': IAR
 }

tools/toolchains/arm.py

@@ -296,7 +296,8 @@ class ARMC6(ARM_STD):
                        "CortexM33-NS", "Cortex-A9"]
     @staticmethod
     def check_executable():
-        return mbedToolchain.generic_check_executable("ARMC6", "armclang", 1)
+        return(mbedToolchain.generic_check_executable("ARMC6", "armclang", 1) or
+               mbedToolchain.generic_check_executable("ARM", "armclang", 1))
 
     def __init__(self, target, *args, **kwargs):
         mbedToolchain.__init__(self, target, *args, **kwargs)