init: Add an extra '_' between level names and priority in sections

This is an optional commit, but it makes things slightly easier to read
in zephyr.map.

Signed-off-by: Tomasz Bursztyka <[email protected]>

Author: tbursztyka

cmake/modules/extensions.cmake

@@ -5197,18 +5197,18 @@ 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
   )
   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

@@ -149,7 +149,7 @@ struct init_entry {
  * linker scripts to sort them according to the specified level and priority.
  */
 #define Z_INIT_ENTRY_SECTION(level, prio)                                      \
-	__attribute__((__section__(".z_init_" #level STRINGIFY(prio)"_")))
+	__attribute__((__section__(".z_init_" #level "_" STRINGIFY(prio)"_")))
 
 
 /* Designated initializers where added to C in C99. There were added to

include/zephyr/linker/linker-defs.h

@@ -46,9 +46,9 @@
  */
 #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##_?_*)));	\
+		KEEP(*(SORT(.z_##object##_##level##_??_*)));	\
+		KEEP(*(SORT(.z_##object##_##level##_???_*)));
 
 /*
  * link in shell initialization objects for all modules that use shell and