Merge pull request #13987 from multiplemonomials/cmake-global-options

CMake: Set required toolchain and processor flags globally, instead of per-target
ARMmbed · Dec 10, 2020 · cca6652 · cca6652
2 parents 2c1ce49 + 975a871
commit cca6652
Show file tree

Hide file tree

Showing 27 changed files with 449 additions and 781 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,6 @@
 cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
 
 include(${MBED_CONFIG_PATH}/mbed_config.cmake)
-include(${MBED_PATH}/tools/cmake/core.cmake)
 
 add_library(mbed-core INTERFACE)
 
@@ -55,8 +54,6 @@ endif()
 
 mbed_set_cpu_core_definitions(mbed-core)
 if(${MBED_TOOLCHAIN_FILE_USED})
-    mbed_set_cpu_core_options(mbed-core ${MBED_TOOLCHAIN})
-    mbed_set_toolchain_options(mbed-core)
     mbed_set_profile_options(mbed-core ${MBED_TOOLCHAIN})
     mbed_set_c_lib(mbed-core ${MBED_C_LIB})
     mbed_set_printf_lib(mbed-core ${MBED_PRINTF_LIB})

diff --git a/tools/cmake/app.cmake b/tools/cmake/app.cmake
@@ -9,17 +9,13 @@ endif()
 
 include(${MBED_CONFIG_PATH}/mbed_config.cmake)
 
-# Set default toolchain file
+# Load toolchain file
 if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
     set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
-
-    set(CMAKE_TOOLCHAIN_FILE "${MBED_PATH}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
-
-    # Specify locations for toolchains and generic options
-    include(${MBED_PATH}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
-
-    # Specify available build profiles and add options for the selected build profile
-    include(${MBED_PATH}/tools/cmake/profile.cmake)
+    include(${MBED_PATH}/tools/cmake/toolchain.cmake)
 endif()
 
+# Specify available build profiles and add options for the selected build profile
+include(${MBED_PATH}/tools/cmake/profile.cmake)
+
 enable_language(C CXX ASM)
diff --git a/tools/cmake/core.cmake b/tools/cmake/core.cmake
diff --git a/tools/cmake/cores/Cortex-A9.cmake b/tools/cmake/cores/Cortex-A9.cmake
@@ -1,45 +1,26 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb-interwork"
-            "-marm"
-            "-march=armv7-a"
-            "-mfpu=vfpv3"
-            "-mfloat-abi=hard"
-            "-mno-unaligned-access"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND compile_options
-            "-mcpu=cortex-a9"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-A9>
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                "--cpu=Cortex-A9"
-        )
-    endif()
-endfunction()
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb-interwork"
+        "-marm"
+        "-march=armv7-a"
+        "-mfpu=vfpv3"
+        "-mfloat-abi=hard"
+        "-mno-unaligned-access"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-a9"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-A9"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-A9"
+    )
+endif()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}

diff --git a/tools/cmake/cores/Cortex-M0+.cmake b/tools/cmake/cores/Cortex-M0+.cmake
@@ -2,40 +2,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb"
-            "-mcpu=cortex-m0plus"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND compile_options
-            "-mcpu=cortex-m0plus"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0plus>
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                "--cpu=Cortex-M0plus"
-        )
-    endif()
-endfunction()
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb"
+        "-mcpu=cortex-m0plus"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-m0plus"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-M0plus"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-M0plus"
+    )
+endif()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}

diff --git a/tools/cmake/cores/Cortex-M0.cmake b/tools/cmake/cores/Cortex-M0.cmake
@@ -2,39 +2,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND options
-            "-mcpu=cortex-m0"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0>
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                "-cpu=Cortex-M0"
-        )
-    endif()
-endfunction()
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-m0"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-M0"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-M0"
+    )
+endif()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}

diff --git a/tools/cmake/cores/Cortex-M1.cmake b/tools/cmake/cores/Cortex-M1.cmake
@@ -2,39 +2,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND options
-            "-mcpu=cortex-m1"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M1>
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                "--cpu=Cortex-M1"
-        )
-    endif()
-endfunction()
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-m1"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-M1"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-M1"
+    )
+endif()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}

diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake
@@ -2,39 +2,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND compile_options
-            "-mcpu=cortex-m23"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M23>
-        )
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-m23"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-M23"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-M23"
+    )
+endif()
 
-        target_link_options(${target}
-            INTERFACE
-                "--cpu=Cortex-M23"
-        )
-    endif()
-endfunction()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}

diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake
@@ -2,39 +2,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Sets cpu core options
-function(mbed_set_cpu_core_options target mbed_toolchain)
-    if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND common_toolchain_options
-            "-mthumb"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-
-        target_link_options(${target}
-            INTERFACE
-                ${common_toolchain_options}
-        )
-    elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND compile_options
-            "-mcpu=cortex-m23"
-        )
-
-        target_compile_options(${target}
-            INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M23>
-        )
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    list(APPEND common_options
+        "-mthumb"
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    list(APPEND c_cxx_compile_options
+        "-mcpu=cortex-m23"
+    )
+    list(APPEND asm_compile_options
+        "-mcpu=Cortex-M23"
+    )
+    list(APPEND link_options
+        "--cpu=Cortex-M23"
+    )
+endif()
 
-        target_link_options(${target}
-            INTERFACE
-                "--cpu=Cortex-M23"
-        )
-    endif()
-endfunction()
 
 function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}