diff --git a/boards/native/native_sim/CMakeLists.txt b/boards/native/native_sim/CMakeLists.txt index 613b7df4f8234..d8fb1fa9e18a2 100644 --- a/boards/native/native_sim/CMakeLists.txt +++ b/boards/native/native_sim/CMakeLists.txt @@ -16,6 +16,10 @@ zephyr_library_sources( if(CONFIG_NATIVE_SIM_REBOOT) zephyr_library_sources(reboot.c) target_sources(native_simulator INTERFACE reboot_bottom.c) + + # Explicitly link with libgcc_s to work around a race condition in glibc when + # dynamically loading libgcc_s in multiple threads. + target_link_options(native_simulator INTERFACE "-lgcc_s") endif() zephyr_include_directories( diff --git a/tests/boards/native_sim/reset_hw_info/testcase.yaml b/tests/boards/native_sim/reset_hw_info/testcase.yaml index dfafd2c029498..00d5601483e16 100644 --- a/tests/boards/native_sim/reset_hw_info/testcase.yaml +++ b/tests/boards/native_sim/reset_hw_info/testcase.yaml @@ -1,6 +1,5 @@ tests: boards.native_sim.reset_hw_info: - skip: true platform_allow: - native_sim - native_sim/native/64