CMake toolchain: revert generic changes

Author: 0xc0170

cmake/toolchain.cmake

@@ -40,6 +40,29 @@ elseif (MBED_CPU_CORE STREQUAL Cortex-M7FD)
     set(CMAKE_SYSTEM_PROCESSOR cortex-m7)
 endif()
 
+# Compiler setup
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_CROSSCOMPILING TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+
+# Set the language standard to use per target
+function(mbed_set_language_standard target)
+    set_target_properties(${target}
+        PROPERTIES
+            C_STANDARD 11
+            C_STANDARD_REQUIRED YES
+            C_EXTENSIONS YES
+    )
+
+    set_target_properties(${target}
+        PROPERTIES
+            CXX_STANDARD 14
+            CXX_STANDARD_REQUIRED YES
+            CXX_EXTENSIONS YES
+    )
+endfunction()
+
 # Clear toolchains options for all languages as Mbed OS uses
 # different initialisation options (such as for optimization and debug symbols)
 set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)

cmake/toolchains/GCC_ARM.cmake

@@ -1,34 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# Compiler setup
-set(CMAKE_SYSTEM_NAME Generic)
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_C_COMPILER_WORKS TRUE)
-set(CMAKE_CXX_COMPILER_WORKS TRUE)
-
 set(CMAKE_ASM_COMPILER "arm-none-eabi-gcc")
 set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
 set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
 set(GCC_ELF2BIN "arm-none-eabi-objcopy")
 set_property(GLOBAL PROPERTY ELF2BIN ${GCC_ELF2BIN})
 
-# Set the language standard to use per target
-function(mbed_set_language_standard target)
-    set_target_properties(${target}
-        PROPERTIES
-            C_STANDARD 11
-            C_STANDARD_REQUIRED YES
-            C_EXTENSIONS YES
-    )
-
-    set_target_properties(${target}
-        PROPERTIES
-            CXX_STANDARD 14
-            CXX_STANDARD_REQUIRED YES
-            CXX_EXTENSIONS YES
-    )
-endfunction()
 
 # Sets toolchain options
 function(mbed_set_toolchain_options target)