zephyr: userspace: remove an indiscriminate option#10362
Merged
lgirdwood merged 1 commit intothesofproject:mainfrom Nov 12, 2025
Merged
zephyr: userspace: remove an indiscriminate option#10362lgirdwood merged 1 commit intothesofproject:mainfrom
lgirdwood merged 1 commit intothesofproject:mainfrom
Conversation
The -mno-global-merge compiler option is added by Zephyr for clang userspace builds in the top-level CMakeLists.txt as if(CONFIG_USERSPACE) zephyr_compile_options($<TARGET_PROPERTY:compiler,no_global_merge>) endif() so there's no need to add it again in SOF. Particularly because it's only available with clang and shouldn't be enabled for gcc. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
lyakh
requested review from
abonislawski,
dbaluta,
iuliana-prodan and
kv2019i
as code owners
There was a problem hiding this comment.
Pull Request Overview
This PR removes a redundant compiler option that is already handled by Zephyr's build system. The change eliminates the -mno-global-merge compiler flag from SOF's CMakeLists.txt since Zephyr already adds this option for userspace builds in its top-level configuration.
Key changes:
- Removed duplicate
-mno-global-mergeoption from SOF's CMake configuration to avoid redundancy and potential gcc compatibility issues
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
abonislawski
approved these changes
Nov 12, 2025
lgirdwood
approved these changes
Nov 12, 2025
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
3 participants
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.
The -mno-global-merge compiler option is added by Zephyr for clang userspace builds in the top-level CMakeLists.txt as if(CONFIG_USERSPACE)
zephyr_compile_options($<TARGET_PROPERTY:compiler,no_global_merge>)
endif()
so there's no need to add it again in SOF. Particularly because it's only available with clang and shouldn't be enabled for gcc.