Skip to content

Commit 53df9fb

Browse files
lyakhlgirdwood
authored andcommitted
zephyr: userspace: remove an indiscriminate option
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>
1 parent e8353e2 commit 53df9fb

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

zephyr/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,6 @@ if (NOT CONFIG_COMPILER_INLINE_FUNCTION_OPTION)
552552
target_compile_options(SOF INTERFACE -fno-inline-functions)
553553
endif()
554554

555-
if (CONFIG_USERSPACE)
556-
target_compile_options(SOF INTERFACE -mno-global-merge)
557-
endif()
558-
559555
# SOF needs `typeof`, `__VA_ARGS__` and maybe other GNU C99
560556
# extensions. TODO other flags required ?
561557
target_compile_options(SOF INTERFACE $<$<COMPILE_LANGUAGE:C,ASM>: -std=gnu99>)

0 commit comments

Comments
 (0)