This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 177aa4797215b2fd788d7c6af750d310a69da337
Author: wangmingrong1 <[email protected]>
AuthorDate: Wed Feb 19 14:35:15 2025 +0800

    cmake: read and write NUTTX_EXTRA_FLAGS through a GLOBAL property
    
    NUTTX_EXTRA_FLAGS is collected by each arch platform.cmake as a plain
    variable in the top-level scope.  libs/libbuiltin/libgcc removes the
    coverage flags from it under CONFIG_COVERAGE_MINI and stores the result
    in the GLOBAL property NUTTX_EXTRA_FLAGS, but the final link reads the
    variable, so the removal never reaches the link command.
    
    Publish the collected flags as the GLOBAL property in every arch that
    collects them, and read the property back before the final link.
    
    Signed-off-by: wangmingrong1 <[email protected]>
    Signed-off-by: pangzhen1 <[email protected]>
---
 CMakeLists.txt                        | 1 +
 arch/arm/src/cmake/platform.cmake     | 2 ++
 arch/rh850/src/cmake/platform.cmake   | 2 ++
 arch/risc-v/src/cmake/platform.cmake  | 2 ++
 arch/tricore/src/cmake/platform.cmake | 2 ++
 arch/x86_64/src/cmake/platform.cmake  | 2 ++
 arch/xtensa/src/cmake/platform.cmake  | 2 ++
 7 files changed, 13 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b48586b6b..8f70846c2a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -839,6 +839,7 @@ if(NOT CONFIG_ARCH_SIM)
     # Remove executable suffix
     set(CMAKE_EXECUTABLE_SUFFIX "")
   else()
+    get_property(NUTTX_EXTRA_FLAGS GLOBAL PROPERTY NUTTX_EXTRA_FLAGS)
     if(NUTTX_EXTRA_FLAGS)
       list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
     endif()
diff --git a/arch/arm/src/cmake/platform.cmake 
b/arch/arm/src/cmake/platform.cmake
index 1a5219e5e32..1c9da9699d7 100644
--- a/arch/arm/src/cmake/platform.cmake
+++ b/arch/arm/src/cmake/platform.cmake
@@ -81,6 +81,8 @@ if(NUTTX_EXTRA_FLAGS)
   list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
 endif()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 nuttx_find_toolchain_lib()
diff --git a/arch/rh850/src/cmake/platform.cmake 
b/arch/rh850/src/cmake/platform.cmake
index aabdd04ed48..a1d64d05a5d 100644
--- a/arch/rh850/src/cmake/platform.cmake
+++ b/arch/rh850/src/cmake/platform.cmake
@@ -37,6 +37,8 @@ foreach(FLAG ${TOOLCHAIN_DIR_FLAGS})
   endif()
 endforeach()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 nuttx_find_toolchain_lib()
diff --git a/arch/risc-v/src/cmake/platform.cmake 
b/arch/risc-v/src/cmake/platform.cmake
index e5067bf4899..45049ff1de7 100644
--- a/arch/risc-v/src/cmake/platform.cmake
+++ b/arch/risc-v/src/cmake/platform.cmake
@@ -39,6 +39,8 @@ if(NUTTX_EXTRA_FLAGS)
   list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
 endif()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 nuttx_find_toolchain_lib()
diff --git a/arch/tricore/src/cmake/platform.cmake 
b/arch/tricore/src/cmake/platform.cmake
index 4502bb34b3f..f095ba79843 100644
--- a/arch/tricore/src/cmake/platform.cmake
+++ b/arch/tricore/src/cmake/platform.cmake
@@ -41,6 +41,8 @@ if(NUTTX_EXTRA_FLAGS)
   list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
 endif()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 if(CONFIG_TRICORE_TOOLCHAIN_GNU)
diff --git a/arch/x86_64/src/cmake/platform.cmake 
b/arch/x86_64/src/cmake/platform.cmake
index 6241caa9e35..07f9208a549 100644
--- a/arch/x86_64/src/cmake/platform.cmake
+++ b/arch/x86_64/src/cmake/platform.cmake
@@ -39,6 +39,8 @@ if(NUTTX_EXTRA_FLAGS)
   list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
 endif()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 nuttx_find_toolchain_lib()
diff --git a/arch/xtensa/src/cmake/platform.cmake 
b/arch/xtensa/src/cmake/platform.cmake
index 6bf8882922c..758eaa60068 100644
--- a/arch/xtensa/src/cmake/platform.cmake
+++ b/arch/xtensa/src/cmake/platform.cmake
@@ -38,6 +38,8 @@ if(NUTTX_EXTRA_FLAGS)
   list(REMOVE_DUPLICATES NUTTX_EXTRA_FLAGS)
 endif()
 
+set_property(GLOBAL PROPERTY NUTTX_EXTRA_FLAGS ${NUTTX_EXTRA_FLAGS})
+
 separate_arguments(CMAKE_C_FLAG_ARGS NATIVE_COMMAND ${CMAKE_C_FLAGS})
 
 execute_process(

Reply via email to