From 21e2028bef0d43f5e987ff404bfa03c60eec2053 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 7 Aug 2024 16:45:30 +0000 Subject: [PATCH] tools/plugin: drop bogus -Wl,-EL binutils endianness option This mysterious option has been causing portability issues and has never made any difference, see previous commits for details. I compiled the plugin with and without it and there was absolutely zero binary difference. Let's remove it from all tools/plugin/ CMakeLists.txt files before the mass copy/paste/diverge there spreads it even more. Signed-off-by: Marc Herbert --- tools/plugin/alsaplug/CMakeLists.txt | 4 ++-- tools/plugin/modules/CMakeLists.txt | 4 ++-- tools/plugin/modules/ov_noise_suppression/CMakeLists.txt | 2 +- tools/plugin/pipe/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/plugin/alsaplug/CMakeLists.txt b/tools/plugin/alsaplug/CMakeLists.txt index c982d90d6106..4074d8b4a31a 100644 --- a/tools/plugin/alsaplug/CMakeLists.txt +++ b/tools/plugin/alsaplug/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(asound_module_pcm_sof PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${sof_source_directory}/src/audio) -target_compile_options(asound_module_pcm_sof PRIVATE -DPIC -g -O3 -Wl,-EL -Wmissing-prototypes +target_compile_options(asound_module_pcm_sof PRIVATE -DPIC -g -O3 -Wmissing-prototypes -Wimplicit-fallthrough -DCONFIG_LIBRARY -imacros${config_h}) install(TARGETS asound_module_pcm_sof DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib) @@ -47,7 +47,7 @@ target_include_directories(asound_module_ctl_sof PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${sof_source_directory}/src/audio) -target_compile_options(asound_module_ctl_sof PRIVATE -DPIC -g -O3 -Wl,-EL -Wmissing-prototypes +target_compile_options(asound_module_ctl_sof PRIVATE -DPIC -g -O3 -Wmissing-prototypes -Wimplicit-fallthrough -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) install(TARGETS asound_module_ctl_sof DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib) diff --git a/tools/plugin/modules/CMakeLists.txt b/tools/plugin/modules/CMakeLists.txt index 507f183d97a1..d737972cde7d 100644 --- a/tools/plugin/modules/CMakeLists.txt +++ b/tools/plugin/modules/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(sof_mod_shm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../pipe ${sof_source_directory}/src/audio) -target_compile_options(sof_mod_shm PRIVATE -DPIC -g -O3 -Wl,-EL -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) +target_compile_options(sof_mod_shm PRIVATE -DPIC -g -O3 -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) install(TARGETS sof_mod_shm DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib) @@ -39,7 +39,7 @@ target_include_directories(sof_mod_alsa PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../pipe ${sof_source_directory}/src/audio) -target_compile_options(sof_mod_alsa PRIVATE -DPIC -g -O3 -Wl,-EL -Wmissing-prototypes +target_compile_options(sof_mod_alsa PRIVATE -DPIC -g -O3 -Wmissing-prototypes -Wimplicit-fallthrough -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) install(TARGETS sof_mod_alsa diff --git a/tools/plugin/modules/ov_noise_suppression/CMakeLists.txt b/tools/plugin/modules/ov_noise_suppression/CMakeLists.txt index 1e6e0f47aea2..039e9056ee45 100644 --- a/tools/plugin/modules/ov_noise_suppression/CMakeLists.txt +++ b/tools/plugin/modules/ov_noise_suppression/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(sof_ns MODULE noise_suppression.c) target_link_libraries(sof_ns PRIVATE sof_ns_interface) target_link_libraries(sof_ns PRIVATE -Wl,--export-dynamic) sof_append_relative_path_definitions(sof_ns) -target_compile_options(sof_ns PRIVATE -DPIC -g -O3 -Wl,-EL -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) +target_compile_options(sof_ns PRIVATE -DPIC -g -O3 -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) install(TARGETS sof_ns DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib) target_include_directories(sof_ns PRIVATE diff --git a/tools/plugin/pipe/CMakeLists.txt b/tools/plugin/pipe/CMakeLists.txt index 69f6245cfab2..ef7960c5a048 100644 --- a/tools/plugin/pipe/CMakeLists.txt +++ b/tools/plugin/pipe/CMakeLists.txt @@ -16,7 +16,7 @@ target_include_directories(sof-pipe PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${sof_source_directory}/src/audio) -target_compile_options(sof-pipe PRIVATE -DPIC -g -O3 -Wl,-EL -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) +target_compile_options(sof-pipe PRIVATE -DPIC -g -O3 -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h}) target_include_directories(sof-pipe PRIVATE ${sof_install_directory}/include) target_include_directories(sof-pipe PRIVATE ${parser_install_dir}/include)