From 7fe8720c9d230b6e17540fef9341e0bd6752fc4d Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 8 Apr 2021 13:32:45 +1000 Subject: [PATCH 1/2] Revert "esp_event test: Disable linker relaxations in this component, to temporarily workaround a linker bug" This reverts commit 4eb9cc68a6136b84cac4fe68a5aadfcb936bcae8. Alternative fix to be applied in next commit. --- components/esp_event/test/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/esp_event/test/CMakeLists.txt b/components/esp_event/test/CMakeLists.txt index b6690eb027..44e4b7ec84 100644 --- a/components/esp_event/test/CMakeLists.txt +++ b/components/esp_event/test/CMakeLists.txt @@ -1,8 +1,3 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS . ../private_include PRIV_REQUIRES cmock test_utils esp_event driver) - -if(CONFIG_IDF_TARGET_ARCH_RISCV) - # Temporary workaround for a linker issue on RISC-V that should be resolved in binutils 2.35 (internal ref: GCC-101) - target_compile_options(${COMPONENT_LIB} PRIVATE -mno-relax) -endif() From 202154ff1cfde70502381de6e5c6ef27b0d3ede0 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 8 Apr 2021 13:30:04 +1000 Subject: [PATCH 2/2] ut: Exclude test_utils component from default_2_c3 config Theory is that the large alignments in this test component are triggering linker bug (to be fixed in next toolchain update). This component is already tested in a dedicated config, so it doesn't need to be included in this config. --- tools/unit-test-app/configs/default_2_c3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index fbd8f6d97b..0b87f01d41 100644 --- a/tools/unit-test-app/configs/default_2_c3 +++ b/tools/unit-test-app/configs/default_2_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32c3" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32c3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32c3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls test_utils