From 4b3cd02e6ad0565b614b7304368e89a4c4b6bb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Bergman?= <bjorn.bergman@iar.com>
Date: Mon, 17 Feb 2025 15:03:54 +0000
Subject: [PATCH] toolchain: iar: Put KEEP on init-blocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To circumvent peculiarities in the linker, the _init blocks
(as well as their content) needs to be tagged with keep.

Signed-off-by: Björn Bergman <bjorn.bergman@iar.com>
---
 cmake/linker/iar/config_file_script.cmake | 70 +++++++++++++----------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/cmake/linker/iar/config_file_script.cmake b/cmake/linker/iar/config_file_script.cmake
index 917c9a1602a..2877fcaa1d3 100644
--- a/cmake/linker/iar/config_file_script.cmake
+++ b/cmake/linker/iar/config_file_script.cmake
@@ -606,6 +606,15 @@ function(section_to_string)
         list(APPEND to_be_kept "section ${setting}")
       endforeach()
     endif()
+    # In ilink if a block with min_size=X  does not match any input sections,
+    # its _init block may be discarded despite being needed for spacing with
+    # other _init blocks. To get around tihs, lets tag min_size blocks as keep.
+    if(CONFIG_IAR_ZEPHYR_INIT
+       AND DEFINED group_parent_vma AND DEFINED group_parent_lma
+       AND DEFINED i_min_size
+       AND NOT ${noinit})
+      list(APPEND to_be_kept "block ${name_clean}_${idx}_init")
+    endif()
     if(DEFINED symbols)
       list(LENGTH symbols symbols_count)
       if(${symbols_count} GREATER 0)
@@ -784,38 +793,39 @@ function(section_to_string)
     list(JOIN current_sections ", " SELECTORS)
     set(TEMP "${TEMP}\ndo not initialize {\n${SELECTORS}\n};")
   elseif(DEFINED group_parent_vma AND DEFINED group_parent_lma)
-    if(DEFINED current_sections)
-      if(CONFIG_IAR_DATA_INIT)
-        set(TEMP "${TEMP}\ninitialize by copy\n")
-        set(TEMP "${TEMP}{\n")
-        foreach(section ${current_sections})
-          set(TEMP "${TEMP}  ${section},\n")
-        endforeach()
-        set(TEMP "${TEMP}};")
+    if(CONFIG_IAR_DATA_INIT AND DEFINED current_sections)
+      set(TEMP "${TEMP}\ninitialize by copy\n")
+      set(TEMP "${TEMP}{\n")
+      foreach(section ${current_sections})
+        set(TEMP "${TEMP}  ${section},\n")
+      endforeach()
+      set(TEMP "${TEMP}};")
 
-        set(TEMP "${TEMP}\n\"${name}_init\": place in ${group_parent_lma} {\n")
-        foreach(section ${current_sections})
-          set(TEMP "${TEMP}  ${section}_init,\n")
-        endforeach()
-        set(TEMP "${TEMP}};")
-      elseif(CONFIG_IAR_ZEPHYR_INIT)
-        # Generate the _init block and the initialize manually statement.
-        # Note that we need to have the X_init block defined even if we have
-        # no sections, since there will come a "place in XXX" statement later.
+      set(TEMP "${TEMP}\n\"${name}_init\": place in ${group_parent_lma} {\n")
+      foreach(section ${current_sections})
+        set(TEMP "${TEMP}  ${section}_init,\n")
+      endforeach()
+      set(TEMP "${TEMP}};")
+    elseif(CONFIG_IAR_ZEPHYR_INIT)
+      # Generate the _init block and the initialize manually statement.
+      # Note that we need to have the X_init block defined even if we have
+      # no sections, since there will come a "place in XXX" statement later.
 
-        # "${TEMP}" is there too keep the ';' else it will be a list
-        string(REGEX REPLACE "(block[ \t\r\n]+)([^ \t\r\n]+)" "\\1\\2_init" INIT_TEMP "${TEMP}")
-        string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)([^ \t\r\n,]+)" "\\1\\2\\3\\4_init" INIT_TEMP "${INIT_TEMP}")
-        string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)" "ro\\2\\3" INIT_TEMP "${INIT_TEMP}")
-        string(REGEX REPLACE "alphabetical order, " "" INIT_TEMP "${INIT_TEMP}")
-        string(REGEX REPLACE "{ readwrite }" "{ }" INIT_TEMP "${INIT_TEMP}")
+      # "${TEMP}" is there too keep the ';' else it will be a list
+      string(REGEX REPLACE "(block[ \t\r\n]+)([^ \t\r\n]+)" "\\1\\2_init" INIT_TEMP "${TEMP}")
+      string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)([^ \t\r\n,]+)" "\\1\\2\\3\\4_init" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)" "ro\\2\\3" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "alphabetical order, " "" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "{ readwrite }" "{ }" INIT_TEMP "${INIT_TEMP}")
+      set(TEMP "${TEMP}\n${INIT_TEMP}\n")
 
-        # If any content is marked as keep, is has to be applied to the init block
-        # too, esp. for blocks that are not referenced (e.g. empty blocks wiht min_size)
-        if(to_be_kept)
-          list(APPEND to_be_kept "block ${name_clean}_init")
-        endif()
-        set(TEMP "${TEMP}\n${INIT_TEMP}\n")
+      # If any content is marked as keep, is has to be applied to the init block
+      # too, esp. for blocks that are not referenced (e.g. empty blocks with min_size)
+      if(to_be_kept)
+        list(APPEND to_be_kept "block ${name_clean}_init")
+      endif()
+
+      if(DEFINED current_sections)
         set(TEMP "${TEMP}\ninitialize manually with copy friendly\n")
         set(TEMP "${TEMP}{\n")
         foreach(section ${current_sections})
@@ -823,8 +833,8 @@ function(section_to_string)
         endforeach()
         set(TEMP "${TEMP}};")
       endif()
-      set(current_sections)
     endif()
+    set(current_sections)
   endif()
 
   # Finally, add the keeps.