CMake: remove version number from ARM toolchain

The version number was required previously when ARM Compiler 5
and ARM Compiler 6 were both supported. There was a significant
underlying change between the two that justified having distinct
build options settinfgs. It is very unlikely that such a major change will happen
between ARM Compiler 6 and future versions. It is therefore also very unlikely
that distinct option settings for future versions will be needed.
We should therefore avoid appending version number the same way we do not
append it to GCC toolchain configuration settings.

cmake/app.cmake

@@ -49,7 +49,7 @@ if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/app.link_script.ld"
     )
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
     set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
     set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --scatter=${linkerfile}")
 endif()
@@ -62,7 +62,7 @@ if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
         COMMAND ${ELF2BIN} -O ihex $<TARGET_FILE:app> $<TARGET_FILE:app>.hex
         COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.hex"
     )
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
     set(CMAKE_POST_BUILD_COMMAND
         COMMAND ${ELF2BIN} --bin  -o $<TARGET_FILE:app>.bin $<TARGET_FILE:app>
         COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.bin"

cmake/cores/Cortex-A9.cmake

@@ -27,7 +27,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-A9 \

cmake/cores/Cortex-M0+.cmake

@@ -23,7 +23,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M0plus \

cmake/cores/Cortex-M0.cmake

@@ -22,7 +22,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M0 \

cmake/cores/Cortex-M1.cmake

@@ -22,7 +22,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M1 \

cmake/cores/Cortex-M23-NS.cmake

@@ -22,7 +22,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M23 \

cmake/cores/Cortex-M23.cmake

@@ -22,7 +22,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M23 \

cmake/cores/Cortex-M3.cmake

@@ -22,7 +22,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M3 \

cmake/cores/Cortex-M33-NS.cmake

@@ -23,7 +23,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33 \

cmake/cores/Cortex-M33.cmake

@@ -23,7 +23,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33 \

cmake/cores/Cortex-M33F-NS.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33F \

cmake/cores/Cortex-M33F.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33F \

cmake/cores/Cortex-M33FE-NS.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33FE \

cmake/cores/Cortex-M33FE.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M33FE \

cmake/cores/Cortex-M4.cmake

@@ -23,7 +23,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M4 \

cmake/cores/Cortex-M4F.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M4.fp.sp \

cmake/cores/Cortex-M7.cmake

@@ -23,7 +23,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M7 \

cmake/cores/Cortex-M7F.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M7.fp.sp \

cmake/cores/Cortex-M7FD.cmake

@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${GCC_FLAGS} \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
     --cpu=Cortex-M7.fp.dp \

cmake/profiles/debug.cmake

@@ -38,7 +38,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     -Wl,-n \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
     -std=gnu11 \

cmake/profiles/develop.cmake

@@ -32,7 +32,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 -Wl,-n \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS}
     -std=gnu11

cmake/profiles/release.cmake

@@ -34,7 +34,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     -Wl,-n \
 ")
 
-elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
     -std=gnu11 \

cmake/toolchains/ARM.cmake

@@ -1,16 +1,24 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+set(CMAKE_ASM_COMPILER    "armasm")
+set(CMAKE_C_COMPILER      "armclang")
+set(CMAKE_CXX_COMPILER    "armclang")
+set(CMAKE_AR              "armar")
+set(ELF2BIN               "fromelf")
 set(COMMON_FLAGS " \
     -c \
-    --gnu \
-    -Ospace \
-    --split_sections \
-    --apcs=interwork \
-    --brief_diagnostics \
-    --restrict \
-    --multibyte_chars \
-    -O3 \
+    --target=arm-arm-none-eabi \
+    -Oz \
+    -Wno-armcc-pragma-push-pop \
+    -Wno-armcc-pragma-anon-unions \
+    -Wno-reserved-user-defined-literal \
+    -Wno-deprecated-register \
+    -fdata-sections \
+    -fno-exceptions \
+    -MMD \
+    -fshort-enums \
+    -fshort-wchar \
 ")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
     ${COMMON_FLAGS} \
@@ -24,3 +32,7 @@ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
     ${COMMON_FLAGS} \
 ")
+
+add_definitions(
+    -DTOOLCHAIN_ARM
+)

cmake/toolchains/ARMC6.cmake

@@ -1,38 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-set(CMAKE_ASM_COMPILER    "armasm")
-set(CMAKE_C_COMPILER      "armclang")
-set(CMAKE_CXX_COMPILER    "armclang")
-set(CMAKE_AR              "armar")
-set(ELF2BIN               "fromelf")
-set(COMMON_FLAGS " \
-    -c \
-    --target=arm-arm-none-eabi \
-    -Oz \
-    -Wno-armcc-pragma-push-pop \
-    -Wno-armcc-pragma-anon-unions \
-    -Wno-reserved-user-defined-literal \
-    -Wno-deprecated-register \
-    -fdata-sections \
-    -fno-exceptions \
-    -MMD \
-    -fshort-enums \
-    -fshort-wchar \
-")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
-    ${COMMON_FLAGS} \
-")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-    ${COMMON_FLAGS} \
-")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${COMMON_FLAGS} \
-")
-set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${COMMON_FLAGS} \
-")
-
-add_definitions(
-    -DTOOLCHAIN_ARM
-)