CMake: Create separate function to set MCU core compile defintions

hugueskamba · hugueskamba · commit 46c35965c5f6 · 2020-11-06T17:25:23.000Z
The new function (mbed_set_cpu_core_definitions()) should always be
called as it has defintions needed by Mbed OS to work with that
particular MCU core.
mbed_set_cpu_core_options() should only be called if a third-party
toolchain file has not been used as it has compile options that can
cause conflicts.
diff --git a/tools/cmake/cores/Cortex-A9.cmake b/tools/cmake/cores/Cortex-A9.cmake
@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-A9"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_A9
diff --git a/tools/cmake/cores/Cortex-M0+.cmake b/tools/cmake/cores/Cortex-M0+.cmake
@@ -35,7 +35,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M0plus"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M0PLUS
diff --git a/tools/cmake/cores/Cortex-M0.cmake b/tools/cmake/cores/Cortex-M0.cmake
@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "-cpu=Cortex-M0"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M0
diff --git a/tools/cmake/cores/Cortex-M1.cmake b/tools/cmake/cores/Cortex-M1.cmake
@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M1"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M3
diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake
@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M23"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M23
diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake
@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M23"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M23
diff --git a/tools/cmake/cores/Cortex-M3.cmake b/tools/cmake/cores/Cortex-M3.cmake
@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M3"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M3
diff --git a/tools/cmake/cores/Cortex-M33-NS.cmake b/tools/cmake/cores/Cortex-M33-NS.cmake
@@ -36,7 +36,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33.no_dsp.no_fp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M33.cmake b/tools/cmake/cores/Cortex-M33.cmake
@@ -38,7 +38,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33.no_dsp.no_fp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M33F-NS.cmake b/tools/cmake/cores/Cortex-M33F-NS.cmake
@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33.no_dsp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M33F.cmake b/tools/cmake/cores/Cortex-M33F.cmake
@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33.no_dsp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M33FE-NS.cmake b/tools/cmake/cores/Cortex-M33FE-NS.cmake
@@ -37,7 +37,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M33FE.cmake b/tools/cmake/cores/Cortex-M33FE.cmake
@@ -37,7 +37,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M33"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M33
diff --git a/tools/cmake/cores/Cortex-M4.cmake b/tools/cmake/cores/Cortex-M4.cmake
@@ -36,7 +36,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M4.no_fp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M4
diff --git a/tools/cmake/cores/Cortex-M4F.cmake b/tools/cmake/cores/Cortex-M4F.cmake
@@ -3,15 +3,6 @@
 
 # Sets cpu core options
 function(mbed_set_cpu_core_options target mbed_toolchain)
-    target_compile_definitions(${target}
-        INTERFACE
-            __CORTEX_M4
-            ARM_MATH_CM4
-            __FPU_PRESENT=1
-            __CMSIS_RTOS
-            __MBED_CMSIS_RTOS_CM
-    )
-
     if(${mbed_toolchain} STREQUAL "GCC_ARM")
         list(APPEND common_toolchain_options
             "-mthumb"
@@ -49,3 +40,14 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
         )
     endif()
 endfunction()
+
+function(mbed_set_cpu_core_definitions target)
+    target_compile_definitions(${target}
+        INTERFACE
+            __CORTEX_M4
+            ARM_MATH_CM4
+            __FPU_PRESENT=1
+            __CMSIS_RTOS
+            __MBED_CMSIS_RTOS_CM
+    )
+endfunction()
diff --git a/tools/cmake/cores/Cortex-M7.cmake b/tools/cmake/cores/Cortex-M7.cmake
@@ -36,7 +36,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M7.no_fp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M7
diff --git a/tools/cmake/cores/Cortex-M7F.cmake b/tools/cmake/cores/Cortex-M7F.cmake
@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M7.fp.sp"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M7
diff --git a/tools/cmake/cores/Cortex-M7FD.cmake b/tools/cmake/cores/Cortex-M7FD.cmake
@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
                 "--cpu=Cortex-M7"
         )
     endif()
+endfunction()
 
+function(mbed_set_cpu_core_definitions target)
     target_compile_definitions(${target}
         INTERFACE
             __CORTEX_M7

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`39`	`39`	`"--cpu=Cortex-A9"`
`40`	`40`	`)`
`41`	`41`	`endif()`
	`42`	`+endfunction()`
`42`	`43`
	`44`	`+function(mbed_set_cpu_core_definitions target)`
`43`	`45`	`target_compile_definitions(${target}`
`44`	`46`	`INTERFACE`
`45`	`47`	`__CORTEX_A9`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`35`	`35`	`"--cpu=Cortex-M0plus"`
`36`	`36`	`)`
`37`	`37`	`endif()`
	`38`	`+endfunction()`
`38`	`39`
	`40`	`+function(mbed_set_cpu_core_definitions target)`
`39`	`41`	`target_compile_definitions(${target}`
`40`	`42`	`INTERFACE`
`41`	`43`	`__CORTEX_M0PLUS`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`34`	`34`	`"-cpu=Cortex-M0"`
`35`	`35`	`)`
`36`	`36`	`endif()`
	`37`	`+endfunction()`
`37`	`38`
	`39`	`+function(mbed_set_cpu_core_definitions target)`
`38`	`40`	`target_compile_definitions(${target}`
`39`	`41`	`INTERFACE`
`40`	`42`	`__CORTEX_M0`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`36`	`36`	`"--cpu=Cortex-M33.no_dsp.no_fp"`
`37`	`37`	`)`
`38`	`38`	`endif()`
	`39`	`+endfunction()`
`39`	`40`
	`41`	`+function(mbed_set_cpu_core_definitions target)`
`40`	`42`	`target_compile_definitions(${target}`
`41`	`43`	`INTERFACE`
`42`	`44`	`__CORTEX_M33`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`38`	`38`	`"--cpu=Cortex-M33.no_dsp.no_fp"`
`39`	`39`	`)`
`40`	`40`	`endif()`
	`41`	`+endfunction()`
`41`	`42`
	`43`	`+function(mbed_set_cpu_core_definitions target)`
`42`	`44`	`target_compile_definitions(${target}`
`43`	`45`	`INTERFACE`
`44`	`46`	`__CORTEX_M33`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`37`	`37`	`"--cpu=Cortex-M33"`
`38`	`38`	`)`
`39`	`39`	`endif()`
	`40`	`+endfunction()`
`40`	`41`
	`42`	`+function(mbed_set_cpu_core_definitions target)`
`41`	`43`	`target_compile_definitions(${target}`
`42`	`44`	`INTERFACE`
`43`	`45`	`__CORTEX_M33`