linker-defs: Fix sorting order of objects by priority
Commit 0a7b65e tweaked the CREATE_OBJ_LEVEL macro in such a way
that it would break the expected sorting order.
For example if you had 2, 19, 20, 30 as the level, we'd end up sort
these to be 19, 2, 20, 30.
Fix this by adding aditional "_" symbol after the init level counter.
That allows to keep correct sort order (for both GNU and MWDT
toolchains) and distinguish init level counter from section suffix
(for MWDT toolchain).
Fixes zephyrproject-rtos#33464
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
diff --git a/include/device.h b/include/device.h
index 4a0061d..ee90799 100644
--- a/include/device.h
+++ b/include/device.h
@@ -128,7 +128,7 @@
Z_DEVICE_DEFINE_PM(dev_name) \
static const Z_DECL_ALIGN(struct device) \
DEVICE_NAME_GET(dev_name) __used \
- __attribute__((__section__(".device_" #level STRINGIFY(prio)))) = { \
+ __attribute__((__section__(".device_" #level STRINGIFY(prio)"_"))) = { \
.name = drv_name, \
.config = (cfg_ptr), \
.api = (api_ptr), \
diff --git a/include/init.h b/include/init.h
index dd5df64..e11d080 100644
--- a/include/init.h
+++ b/include/init.h
@@ -85,7 +85,7 @@
#define Z_INIT_ENTRY_DEFINE(_entry_name, _init_fn, _device, _level, _prio) \
static const Z_DECL_ALIGN(struct init_entry) \
_CONCAT(__init_, _entry_name) __used \
- __attribute__((__section__(".init_" #_level STRINGIFY(_prio)))) = { \
+ __attribute__((__section__(".init_" #_level STRINGIFY(_prio)"_"))) = { \
.init = (_init_fn), \
.dev = (_device), \
}
diff --git a/include/linker/linker-defs.h b/include/linker/linker-defs.h
index e033220..c31d2cd 100644
--- a/include/linker/linker-defs.h
+++ b/include/linker/linker-defs.h
@@ -116,8 +116,8 @@
*/
#define CREATE_OBJ_LEVEL(object, level) \
__##object##_##level##_start = .; \
- KEEP(*(SORT(.object##_##level[0-9]*))); \
- KEEP(*(SORT(.object##_##level[1-9][0-9]*)));
+ KEEP(*(SORT(.object##_##level[0-9]_*))); \
+ KEEP(*(SORT(.object##_##level[1-9][0-9]_*)));
/*
* link in shell initialization objects for all modules that use shell and
