From c1ca7a35b0cea766c698b5ffa0efcf3149175f5c Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 7 Jul 2021 11:55:33 +1000 Subject: [PATCH] ldgen: Remove some remaining references to TARGET.project.ld.in --- components/esp_system/startup.c | 2 +- components/soc/esp32s3/soc_memory_layout.c | 2 +- docs/en/api-guides/linker-script-generation.rst | 2 +- docs/zh_CN/api-guides/linker-script-generation.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/esp_system/startup.c b/components/esp_system/startup.c index 32cb377ed5..8afc43087f 100644 --- a/components/esp_system/startup.c +++ b/components/esp_system/startup.c @@ -162,7 +162,7 @@ size_t __cxx_eh_arena_size_get(void) * The rest of the init_array sections is sorted for iteration in descending order during startup, however. * Hence a different section is generated for the init_priority functions which is looped * over in ascending direction instead of descending direction. - * The RISC-V-specific behavior is dependent on the linker script esp32c3.project.ld.in. + * The RISC-V-specific behavior is dependent on the linker script ld/esp32c3/sections.ld.in. */ static void do_global_ctors(void) { diff --git a/components/soc/esp32s3/soc_memory_layout.c b/components/soc/esp32s3/soc_memory_layout.c index 9da8bdcae7..597a55c3e0 100644 --- a/components/soc/esp32s3/soc_memory_layout.c +++ b/components/soc/esp32s3/soc_memory_layout.c @@ -79,7 +79,7 @@ const soc_memory_region_t soc_memory_regions[] = { const size_t soc_memory_region_count = sizeof(soc_memory_regions) / sizeof(soc_memory_region_t); -extern int _data_start, _heap_start, _iram_start, _iram_end; // defined in esp32s3.project.ld.in +extern int _data_start, _heap_start, _iram_start, _iram_end; // defined in sections.ld.in /** * Reserved memory regions. diff --git a/docs/en/api-guides/linker-script-generation.rst b/docs/en/api-guides/linker-script-generation.rst index b94a62642f..ac813487bf 100644 --- a/docs/en/api-guides/linker-script-generation.rst +++ b/docs/en/api-guides/linker-script-generation.rst @@ -619,4 +619,4 @@ Then the corresponding excerpt from the generated linker script will be as follo Rule generated from the default scheme entry ``iram -> iram0_text``. Since the default scheme specifies an ``iram -> iram0_text`` entry, it too is placed wherever ``iram0_text`` is referenced by a marker. Since it is a rule generated from the default scheme, it comes first among all other rules collected under the same target name. - The linker script template currently used is :component_file:`{IDF_TARGET_PATH_NAME}/ld/{IDF_TARGET_PATH_NAME}.project.ld.in`, specified by the ``{IDF_TARGET_PATH_NAME}`` component; the generated output script is put under its build directory. + The linker script template currently used is :component_file:`esp_system/ld/{IDF_TARGET_PATH_NAME}/sections.ld.in`; the generated output script ``sections.ld`` is put under its build directory. diff --git a/docs/zh_CN/api-guides/linker-script-generation.rst b/docs/zh_CN/api-guides/linker-script-generation.rst index a2d70844f2..402e2ea8d8 100644 --- a/docs/zh_CN/api-guides/linker-script-generation.rst +++ b/docs/zh_CN/api-guides/linker-script-generation.rst @@ -619,4 +619,4 @@ ESP-IDF v4.0 变更了链接器脚本片段文件使用的一些语法： 这是根据默认协议条目 ``iram -> iram0_text`` 生成的规则。默认协议指定了 ``iram -> iram0_text`` 条目，因此生成的规则同样也放在被 ``iram0_text`` 标记的地方。由于该规则是根据默认协议生成的，因此在同一目标下收集的所有规则下排在第一位。 - 目前使用的链接器脚本模板是 :component_file:`{IDF_TARGET_PATH_NAME}/ld/{IDF_TARGET_PATH_NAME}.project.ld.in`，由 ``{IDF_TARGET_PATH_NAME}`` 组件指定，生成的脚本存放在构建目录下。 + 目前使用的链接器脚本模板是 :component_file:`esp_system/ld/{IDF_TARGET_PATH_NAME}/sections.ld.in`，生成的脚本存放在构建目录下。