Refactor preprocessing arguments across toolchain configs#2530
Draft
brondani wants to merge 1 commit into
Draft
Conversation
brondani
changed the title
5 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2530 +/- ##
=======================================
Coverage 65.35% 65.35%
=======================================
Files 147 147
Lines 26785 26785
Branches 16227 16227
=======================================
Hits 17506 17506
Misses 7074 7074
Partials 2205 2205
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
Test Results 5 files 39 suites 3m 21s ⏱️ Results for commit d76669e. |
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors how C preprocessor-related command fragments are defined in the toolchain CMake config templates, aiming to centralize/standardize linker-script preprocessing and predefined-macro dump command construction across multiple toolchains (in line with related upstream work).
Changes:
- Moves the
-xclanguage selection out of sharedCPP_FLAGSand into the linker-script preprocessing invocation (CPP_ARGS_LD_SCRIPT) for AC6, Clang, TI Clang, GCC, and XC. - Simplifies predefined-macro dump command fragments (
CPP_DUMP_MACROS) by removing the output path handling from toolchain configs (IAR uses--predef_macros; others previously used>redirection).
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/buildmgr/cbuildgen/config/XC.5.0.0.cmake | Adjusts XC32 preprocessor flags and macro-dump command fragment. |
| tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake | Simplifies IAR macro-dump command fragment by removing the output filename. |
| tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake | Moves -xc to linker-script preprocessing args; updates macro-dump fragment. |
| tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake | Moves -xc to linker-script preprocessing args; updates macro-dump fragment. |
| tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake | Moves -xc to linker-script preprocessing args; updates macro-dump fragment. |
| tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake | Moves -xc to linker-script preprocessing args; updates macro-dump fragment. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
| set(CPP_ARGS_LD_SCRIPT "${CPP_FLAGS} -xc ${CPP_DEFINES} ${CPP_INCLUDES} \"${LD_SCRIPT}\" -o \"${LD_SCRIPT_PP}\"") | ||
| separate_arguments(CPP_ARGS_LD_SCRIPT NATIVE_COMMAND ${CPP_ARGS_LD_SCRIPT}) | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - > \"${COMPILE_MACROS}\"") | ||
| set(CPP_DUMP_MACROS "${CPP_FLAGS} -dM - >") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes
Aligns with Open-CMSIS-Pack/cbuild2cmake#503
Changes
-xclanguage option from the sharedCPP_FLAGSvariable into the linker script preprocessing command (CPP_ARGS_LD_SCRIPT).CPP_DUMP_MACROSin the AC6, Clang, TI Clang, GCC, XC, and IAR toolchain configurations, leaving only the compiler arguments.Checklist
Risk / Follow-up
These changes affect how preprocessing commands are assembled for multiple supported toolchains. The primary risk is regressions in linker script preprocessing or predefined macro generation, so validating build generation across the affected toolchains is recommended.