diff --git a/tools/cmake/toolchains/ARM.cmake b/tools/cmake/toolchains/ARM.cmake index 548fa478f1..5cbb3240ab 100644 --- a/tools/cmake/toolchains/ARM.cmake +++ b/tools/cmake/toolchains/ARM.cmake @@ -53,9 +53,20 @@ function(mbed_set_toolchain_options target) TOOLCHAIN_ARM ) + list(APPEND link_options + "${MBED_STUDIO_ARM_COMPILER}" + ) + + # Add linking time preprocessor macro for TFM targets + if(MBED_CPU_CORE MATCHES "\-NS$") + list(APPEND link_options + "--predefine=\"-DDOMAIN_NS=0x1\"" + ) + endif() + target_link_options(${target} PUBLIC - ${MBED_STUDIO_ARM_COMPILER} + ${link_options} ) endfunction() diff --git a/tools/cmake/toolchains/GCC_ARM.cmake b/tools/cmake/toolchains/GCC_ARM.cmake index e4b26b4df2..46aed8219b 100644 --- a/tools/cmake/toolchains/GCC_ARM.cmake +++ b/tools/cmake/toolchains/GCC_ARM.cmake @@ -23,6 +23,13 @@ function(mbed_set_toolchain_options target) "-T" "${CMAKE_BINARY_DIR}/${APP_TARGET}.link_script.ld" ) + # Add linking time preprocessor macro for TFM targets + if("TFM" IN_LIST MBED_TARGET_LABELS) + list(APPEND link_options + "-DDOMAIN_NS=1" + ) + endif() + list(APPEND common_options "-Wall" "-Wextra" @@ -49,6 +56,7 @@ function(mbed_set_toolchain_options target) TOOLCHAIN_GCC ) + target_link_options(${target} PUBLIC ${common_options}