mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 03:00:34 +03:00
fix(esp_system): enable linking with LLD on RISC-V targets
This commit is contained in:
@@ -512,8 +512,42 @@ function(__init_project_configuration)
|
||||
string(TOUPPER ${target_upper} target_upper)
|
||||
# Add this symbol as a hint for esp_idf_size to guess the target name
|
||||
list(APPEND link_options "-Wl,--defsym=IDF_TARGET_${target_upper}=0")
|
||||
if(CONFIG_COMPILER_USE_LLD)
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
# The last --ld-path on the link line takes precedence over the
|
||||
# one set in the toolchain file, selecting LLD for the link.
|
||||
# The bare name is looked up in PATH.
|
||||
list(APPEND link_options "--ld-path=ld.lld")
|
||||
else()
|
||||
# GCC has no --ld-path; -fuse-ld=lld makes the driver search
|
||||
# its search paths and PATH for a binary named "ld.lld".
|
||||
list(APPEND link_options "-fuse-ld=lld")
|
||||
endif()
|
||||
# Bare-metal images have no dynamic loader, so PT_GNU_RELRO is
|
||||
# meaningless. LLD enables relro by default and errors out when
|
||||
# relro sections (e.g. TLS .flash.tdata) are not contiguous in the
|
||||
# IDF linker scripts, so disable it.
|
||||
list(APPEND link_options "-Wl,-z,norelro")
|
||||
# Some targets (e.g. esp32s3) use NOLOAD dummy sections that
|
||||
# deliberately overlap other sections' address ranges, because two
|
||||
# memory regions alias the same bus address space. GNU ld skips
|
||||
# NOBITS sections in its overlap check; LLD does not, so disable
|
||||
# the check there.
|
||||
list(APPEND link_options "-Wl,--no-check-sections")
|
||||
set(linker_binary "ld.lld")
|
||||
else()
|
||||
set(linker_binary "${CMAKE_LINKER}")
|
||||
endif()
|
||||
# Report which linker the link will use, with its version banner
|
||||
execute_process(COMMAND ${linker_binary} "-v"
|
||||
OUTPUT_VARIABLE linker_version
|
||||
ERROR_QUIET
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
string(REGEX REPLACE "\n.*" "" linker_version "${linker_version}")
|
||||
message(STATUS "Linker: ${linker_binary} (${linker_version})")
|
||||
unset(linker_version)
|
||||
# Check if linker supports --no-warn-rwx-segments
|
||||
execute_process(COMMAND ${CMAKE_LINKER} "--no-warn-rwx-segments" "--version"
|
||||
execute_process(COMMAND ${linker_binary} "--no-warn-rwx-segments" "--version"
|
||||
RESULT_VARIABLE result
|
||||
OUTPUT_QUIET
|
||||
ERROR_QUIET)
|
||||
|
||||
@@ -1268,12 +1268,17 @@ function(__preprocess_linker_script script_in script_out flags component_include
|
||||
# ld.common file, so add the parent directory to the C preprocessor
|
||||
# search path. Works for that layout; a component with a different
|
||||
# layout, or one that must drop -C, should pass FLAGS instead.
|
||||
# esp_system/ld is added as well so that scripts of other components
|
||||
# can include the shared fragments living there (e.g.
|
||||
# ld.elf.internal.sections).
|
||||
set(base_flags "-C")
|
||||
get_filename_component(script_parent_dir "${script_in}" DIRECTORY)
|
||||
get_filename_component(script_parent_name "${script_parent_dir}" NAME)
|
||||
if(script_parent_name STREQUAL idf_target)
|
||||
get_filename_component(dir_to_include "${script_parent_dir}" DIRECTORY)
|
||||
string(APPEND base_flags " -I\"${dir_to_include}\"")
|
||||
idf_component_get_property(esp_system_dir esp_system COMPONENT_DIR)
|
||||
string(APPEND base_flags
|
||||
" -I\"${dir_to_include}\" -I\"${esp_system_dir}/ld\"")
|
||||
endif()
|
||||
else()
|
||||
# Explicit FLAGS replace the whole default set, including -C. config_dir
|
||||
|
||||
Reference in New Issue
Block a user