Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/dynamic_flags_in_toolchain_cmake_v6.0' into 'release/v6.0'

Browse Source 
feat(build): propagate compiler flags from files to toolchain.cmake (v6.0)

See merge request espressif/esp-idf!43499
This commit is contained in:
Alexey Gerenkov
2025-11-21 16:19:34 +08:00
parent ec0ef59535 d5ea1e4af5
commit d8e47c5e43
37 changed files with 576 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
+8
View File
@@ -487,6 +487,14 @@ config SOC_CPU_ZCMP_WORKAROUND
bool
default y
config SOC_CPU_ZCMP_PUSH_REVERSED
bool
default y
config SOC_CPU_ZCMP_POPRET_ISSUE
bool
default y
config SOC_DS_SIGNATURE_MAX_BIT_LEN
int
default 3072
components/soc/esp32c5/include/soc/soc_caps.h
+2
View File
@@ -183,6 +183,8 @@
#define SOC_CPU_HAS_LOCKUP_RESET 1
#define SOC_CPU_ZCMP_WORKAROUND 1
#define SOC_CPU_ZCMP_PUSH_REVERSED 1
#define SOC_CPU_ZCMP_POPRET_ISSUE 1
/*-------------------------- DIGITAL SIGNATURE CAPS ----------------------------------------*/
/** The maximum length of a Digital Signature in bits. */
components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
+8
View File
@@ -375,6 +375,14 @@ config SOC_CPU_ZCMP_WORKAROUND
bool
default y
config SOC_CPU_ZCMP_PUSH_REVERSED
bool
default y
config SOC_CPU_ZCMP_POPRET_ISSUE
bool
default y
config SOC_DMA_CAN_ACCESS_FLASH
bool
default y
components/soc/esp32c61/include/soc/soc_caps.h
+2
View File
@@ -150,6 +150,8 @@
#define SOC_CPU_HAS_LOCKUP_RESET 1
#define SOC_CPU_ZCMP_WORKAROUND 1
#define SOC_CPU_ZCMP_PUSH_REVERSED 1
#define SOC_CPU_ZCMP_POPRET_ISSUE 1
/*-------------------------- DMA Common CAPS ----------------------------------------*/
#define SOC_DMA_CAN_ACCESS_FLASH 1 /*!< DMA can access Flash memory */
components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
+16
View File
@@ -247,10 +247,26 @@ config SOC_CPU_HAS_LOCKUP_RESET
bool
default y
config SOC_CPU_HAS_ZC_EXTENSIONS
bool
default y
config SOC_CPU_HAS_ZB_EXTENSIONS
bool
default y
config SOC_CPU_ZCMP_WORKAROUND
bool
default y
config SOC_CPU_ZCMP_PUSH_REVERSED
bool
default y
config SOC_CPU_ZCMP_POPRET_ISSUE
bool
default y
config SOC_DMA_CAN_ACCESS_FLASH
bool
default y
components/soc/esp32h4/include/soc/soc_caps.h
+5
View File
@@ -175,7 +175,12 @@
#define SOC_HP_CPU_HAS_MULTIPLE_CORES 1 // Convenience boolean macro used to determine if a target has multiple cores.
#define SOC_CPU_HAS_LOCKUP_RESET 1
#define SOC_CPU_HAS_ZC_EXTENSIONS 1
#define SOC_CPU_HAS_ZB_EXTENSIONS 1
#define SOC_CPU_ZCMP_WORKAROUND 1
#define SOC_CPU_ZCMP_PUSH_REVERSED 1
#define SOC_CPU_ZCMP_POPRET_ISSUE 1
/*-------------------------- DMA Common CAPS ----------------------------------------*/
#define SOC_DMA_CAN_ACCESS_FLASH 1 /*!< DMA can access Flash memory */
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
+12
View File
@@ -591,6 +591,18 @@ config SOC_CPU_HAS_LOCKUP_RESET
bool
default y
config SOC_CPU_HAS_ZC_EXTENSIONS
bool
default y
config SOC_CPU_ZCMP_PUSH_REVERSED
bool
default y
config SOC_CPU_ZCMP_POPRET_ISSUE
bool
default y
config SOC_SIMD_PREFERRED_DATA_ALIGNMENT
int
default 16
components/soc/esp32p4/include/soc/soc_caps.h
+5
View File
@@ -209,6 +209,11 @@
#define SOC_CPU_HAS_LOCKUP_RESET 1
#define SOC_CPU_HAS_ZC_EXTENSIONS 1
#define SOC_CPU_ZCMP_PUSH_REVERSED 1
#define SOC_CPU_ZCMP_POPRET_ISSUE 1
#define SOC_SIMD_PREFERRED_DATA_ALIGNMENT 16 // The preferred data alignment accepted by the SIMD instructions, in bytes
/*-------------------------- DIGITAL SIGNATURE CAPS ----------------------------------------*/
components/soc/project_include.cmake
+109
View File
@@ -0,0 +1,109 @@
if(CONFIG_IDF_TOOLCHAIN_GCC)
# Common flags
idf_toolchain_add_flags(LINK_OPTIONS "-nostartfiles")
# Target-specific flags
if(CONFIG_IDF_TARGET_ESP32)
idf_toolchain_add_flags(COMPILE_OPTIONS "-Wno-frame-address")
elseif(CONFIG_IDF_TARGET_ESP32C2 OR
CONFIG_IDF_TARGET_ESP32C3)
set(_march "rv32imc_zicsr_zifencei")
elseif(CONFIG_IDF_TARGET_ESP32C5 OR
CONFIG_IDF_TARGET_ESP32C6 OR
CONFIG_IDF_TARGET_ESP32C61 OR
CONFIG_IDF_TARGET_ESP32H2 OR
CONFIG_IDF_TARGET_ESP32H21)
set(_march "rv32imac_zicsr_zifencei_zaamo_zalrsc")
elseif(CONFIG_IDF_TARGET_ESP32H4)
set(_march "rv32imafcb_zicsr_zifencei_zaamo_zalrsc")
elseif(CONFIG_IDF_TARGET_ESP32P4)
set(_march "rv32imafc_zicsr_zifencei_zaamo_zalrsc")
elseif(NOT(CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3))
message(FATAL_ERROR "Unknown Espressif target: ${CONFIG_IDF_TARGET}")
endif()
# Architecture-specific flags
if(CONFIG_IDF_TARGET_ARCH_XTENSA)
idf_toolchain_add_flags(COMPILE_OPTIONS "-mlongcalls"
"-fno-builtin-memcpy"
"-fno-builtin-memset"
"-fno-builtin-bzero")
elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
if(NOT DEFINED _march)
message(FATAL_ERROR "-march option is not defined for target ${CONFIG_IDF_TARGET}!")
endif()
# Clean compile options that were added by previous configurations and may be outdated
idf_toolchain_remove_flags(COMPILE_OPTIONS "-march="
"-mno-cm-push-reverse"
"-mno-cm-popret")
if(CONFIG_SOC_CPU_HAS_ZB_EXTENSIONS)
set(_march "${_march}_zba_zbb_zbs")
endif()
if((CONFIG_SOC_CPU_HAS_ZC_EXTENSIONS AND NOT CONFIG_SOC_CPU_ZCMP_WORKAROUND) OR
CONFIG_COMPILER_ENABLE_RISCV_ZCMP)
if(NOT CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
set(_march "${_march}_zcb_zcmp_zcmt")
if(CONFIG_SOC_CPU_ZCMP_PUSH_REVERSED)
idf_toolchain_add_flags(COMPILE_OPTIONS "-mno-cm-push-reverse")
endif()
if(CONFIG_SOC_CPU_ZCMP_POPRET_ISSUE)
idf_toolchain_add_flags(COMPILE_OPTIONS "-mno-cm-popret")
endif()
endif()
endif()
if(CONFIG_SOC_CPU_HAS_HWLOOP)
set(_march "${_march}_xesploop")
endif()
if(CONFIG_SOC_CPU_HAS_PIE)
set(_march "${_march}_xespv")
if(CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
set(_march "${_march}2p1")
endif()
endif()
if(CONFIG_SOC_CPU_HAS_DSP)
set(_march "${_march}_xespdsp")
endif()
# Set ABI and ARCH options
if(CONFIG_SOC_CPU_HAS_FPU)
idf_toolchain_add_flags(COMPILE_OPTIONS "-mabi=ilp32f")
endif()
idf_toolchain_add_flags(COMPILE_OPTIONS "-march=${_march}")
if(NOT CONFIG_SOC_CPU_MISALIGNED_ACCESS_ON_PMP_MISMATCH_ISSUE)
idf_toolchain_add_flags(COMPILE_OPTIONS "-mtune=esp-base")
endif()
else()
message(FATAL_ERROR "Unknown Espressif architecture: ${CONFIG_IDF_TARGET_ARCH}")
endif()
# Workaround: Re-run CMake compiler ABI detection after ABI flags are set.
#
# Problem: CMake performs compiler checks at an early stage during
# toolchain.cmake processing. At this early stage, response files are not yet
# ready, which causes CMake paths (e.g., CMAKE_<lang>_IMPLICIT_LINK_DIRECTORIES)
# to be incorrectly determined.
#
# Solution: Re-run the ABI detection after ABI flags are present to correctly
# determine these paths.
#
# Note: If the CMake API changes, this solution may need to be revised.
set(lang_ext_pairs "C|c" "CXX|cpp")
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerABI.cmake)
foreach(lang_ext ${lang_ext_pairs})
string(REPLACE "|" ";" lang_ext_parts ${lang_ext})
list(GET lang_ext_parts 0 lang)
list(GET lang_ext_parts 1 ext)
if(DEFINED CMAKE_${lang}_ABI_COMPILED)
unset(CMAKE_${lang}_ABI_COMPILED)
cmake_determine_compiler_abi(${lang} ${CMAKE_ROOT}/Modules/CMake${lang}CompilerABI.${ext})
endif()
endforeach()
endif()