linker: replace ALIGN_WITH_INPUT with SECTION_DATA_PROLOGUE macro

tejlmand · bjarki-andreasen · commit 19d7b6d50134 · 2025-04-04T08:56:00.000+02:00
ALIGN_WITH_INPUT is not supported with LLD and therefore linker scripts
containing this flag will fail.

For LLD, then linking with -omagic (-N) achives the same as what is
needed for XIP systems using ALIGN_WITH_INPUT, therefore adopt ld
snippets to use the Zephyr provided SECTION_DATA_PROLOGUE() macro.

Signed-off-by: Torsten Rasmussen &lt;Torsten.Rasmussen@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/nrf_desktop.ld b/applications/nrf_desktop/nrf_desktop.ld
@@ -1,4 +1,4 @@
-config_channel_modules : ALIGN_WITH_INPUT
+SECTION_DATA_PROLOGUE(config_channel_modules,,)
 {
 	KEEP(*(SORT(config_channel_modules)));
 } GROUP_LINK_IN(ROMABLE_REGION)
diff --git a/subsys/app_event_manager/aem.ld b/subsys/app_event_manager/aem.ld
@@ -5,7 +5,7 @@ ITERABLE_SECTION_ROM(event_submit_hook, 4)
 ITERABLE_SECTION_ROM(event_preprocess_hook, 4)
 ITERABLE_SECTION_ROM(event_postprocess_hook, 4)
 
-event_subscribers_all : ALIGN_WITH_INPUT
+SECTION_DATA_PROLOGUE(event_subscribers_all,,)
 {
 	__start_event_subscribers_all = .;
 	KEEP(*(SORT(event_subscribers_*)));
diff --git a/subsys/event_manager_proxy/em_proxy.ld b/subsys/event_manager_proxy/em_proxy.ld
@@ -8,7 +8,7 @@ event_manager_proxy_event_type_pointer_size_section 0 (DSECT) :
 	KEEP(*(event_manager_proxy_event_type_pointer_size));
 }
 
-event_manager_proxy_array : ALIGN_WITH_INPUT
+SECTION_DATA_PROLOGUE(event_manager_proxy_array,,)
 {
 	_event_manager_proxy_array_list_start = .;
 	event_manager_proxy_array = .;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-config_channel_modules : ALIGN_WITH_INPUT`
	`1`	`+SECTION_DATA_PROLOGUE(config_channel_modules,,)`
`2`	`2`	`{`
`3`	`3`	`KEEP(*(SORT(config_channel_modules)));`
`4`	`4`	`} GROUP_LINK_IN(ROMABLE_REGION)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ ITERABLE_SECTION_ROM(event_submit_hook, 4)`
`5`	`5`	`ITERABLE_SECTION_ROM(event_preprocess_hook, 4)`
`6`	`6`	`ITERABLE_SECTION_ROM(event_postprocess_hook, 4)`
`7`	`7`
`8`		`-event_subscribers_all : ALIGN_WITH_INPUT`
	`8`	`+SECTION_DATA_PROLOGUE(event_subscribers_all,,)`
`9`	`9`	`{`
`10`	`10`	`__start_event_subscribers_all = .;`
`11`	`11`	`KEEP((SORT(event_subscribers_)));`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ event_manager_proxy_event_type_pointer_size_section 0 (DSECT) :`
`8`	`8`	`KEEP(*(event_manager_proxy_event_type_pointer_size));`
`9`	`9`	`}`
`10`	`10`
`11`		`-event_manager_proxy_array : ALIGN_WITH_INPUT`
	`11`	`+SECTION_DATA_PROLOGUE(event_manager_proxy_array,,)`
`12`	`12`	`{`
`13`	`13`	`_event_manager_proxy_array_list_start = .;`
`14`	`14`	`event_manager_proxy_array = .;`