linker: Add underscore between the init level and priority

Ensure the priority is surrounded by underscores for clarity. This makes
sections show up as
z_init_PRE_KERNEL_1_0_0_ instead of
z_init_PRE_KERNEL_10_0_

Signed-off-by: Josh DeWitt <[email protected]>

Author: dewitt-garmin

cmake/linker/iar/config_file_script.cmake

@@ -649,7 +649,7 @@ function(section_to_string)
       set(TEMP "${TEMP} { section ${first_index_section_name} },\n")
     endif()
 
-    # block init_100 with alphabetical order { section .z_init_EARLY?_}
+    # block init_100 with alphabetical order { section .z_init_EARLY_?_}
     set(TEMP "${TEMP}\n  block ${name_clean}_${idx}")
     if(DEFINED offset AND NOT offset EQUAL 0 )
       list(APPEND block_attr "size = ${offset}")

cmake/modules/extensions.cmake

@@ -5240,8 +5240,8 @@ endfunction()
 # This is useful content such as struct devices.
 #
 # For example: zephyr_linker_section_obj_level(SECTION init LEVEL PRE_KERNEL_1)
-# will create an input section matching `.z_init_PRE_KERNEL_1?_` and
-# `.z_init_PRE_KERNEL_1??_`.
+# will create an input section matching `.z_init_PRE_KERNEL_1_?_` and
+# `.z_init_PRE_KERNEL_1_??_`.
 #
 # SECTION <section>: Section in which the objects shall be placed
 # LEVEL <level>    : Priority level, all input sections matching the level
@@ -5265,13 +5265,13 @@ function(zephyr_linker_section_obj_level)
 
   zephyr_linker_section_configure(
     SECTION ${OBJ_SECTION}
-    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}?_*"
+    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}_?_*"
     SYMBOLS __${OBJ_SECTION}_${OBJ_LEVEL}_start
     KEEP SORT NAME
   )
   zephyr_linker_section_configure(
     SECTION ${OBJ_SECTION}
-    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}??_*"
+    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}_??_*"
     KEEP SORT NAME
   )
 endfunction()

include/zephyr/init.h

@@ -108,9 +108,9 @@ struct init_entry {
  * linker scripts to sort them according to the specified
  * level/priority/sub-priority.
  */
-#define Z_INIT_ENTRY_SECTION(level, prio, sub_prio)                           \
-	__attribute__((__section__(                                           \
-		".z_init_" #level STRINGIFY(prio)"_" STRINGIFY(sub_prio)"_")))
+#define Z_INIT_ENTRY_SECTION(level, prio, sub_prio)                                                \
+	__attribute__((                                                                            \
+		__section__(".z_init_" #level "_" STRINGIFY(prio)"_" STRINGIFY(sub_prio)"_")))
 
 /** @endcond */
 

include/zephyr/linker/linker-defs.h

@@ -47,8 +47,8 @@
 /* clang-format off */
 #define CREATE_OBJ_LEVEL(object, level)				\
 		__##object##_##level##_start = .;		\
-		KEEP(*(SORT(.z_##object##_##level?_*)));	\
-		KEEP(*(SORT(.z_##object##_##level??_*)));
+		KEEP(*(SORT(.z_##object##_##level##_?_*)));	\
+		KEEP(*(SORT(.z_##object##_##level##_??_*)));
 /* clang-format on */
 
 /*