Skip to content

Commit 4edb8af

Browse files
LoveKarlssonkartben
authored andcommitted
cmake: linker: Removed unnecessary regexp in link generator
In the linker script generator there was one error checking construct that used regexp and that ended up in the generated linker file, which caused parsing problems with the IAR linker. It was unnecessary. Also updated common-rom-kernel-devices.ld. Signed-off-by: Lars-Ove Karlsson <[email protected]>
1 parent 4ef64e7 commit 4edb8af

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/linker_script/common/common-rom.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
2626
endif()
2727

2828
zephyr_linker_section(NAME initlevel_error KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
29-
zephyr_linker_section_configure(SECTION initlevel_error INPUT ".z_init_[_A-Z0-9]*" KEEP SORT NAME)
29+
zephyr_linker_section_configure(SECTION initlevel_error INPUT ".z_init_*" KEEP SORT NAME)
3030
# How to do cross linker ?
3131
# ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.")
3232

include/zephyr/linker/common-rom/common-rom-kernel-devices.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
/* verify we don't have rogue .z_init_<something> initlevel sections */
6868
SECTION_PROLOGUE(initlevel_error,,)
6969
{
70-
KEEP(*(SORT(.z_init_[_A-Z0-9]*)))
70+
KEEP(*(SORT(.z_init_*)))
7171
}
7272
ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.")
7373

0 commit comments

Comments
 (0)