adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

llext: fix Z_GENERIC_SECTION() usage

Browse source 
Z_GENERIC_SECTION() uses STRINGIFY() to convert its argument to a
string, therefore the argument shouldn't contain additional quotes.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2025-01-20 13:50:42 +01:00 committed by Benjamin Cabé
parent 0689d6d7e7
commit 76e1e1b804
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/zephyr/llext/symbol.h
View file

@ -92,7 +92,7 @@ struct llext_symtable {
/* Extension build: add exported symbols to llext table */ /* Extension build: add exported symbols to llext table */
#define Z_LL_EXTENSION_SYMBOL_NAMED(sym_ident, sym_name) \ #define Z_LL_EXTENSION_SYMBOL_NAMED(sym_ident, sym_name) \
static const struct llext_const_symbol \ static const struct llext_const_symbol \
Z_GENERIC_SECTION(".exported_sym") __used \ Z_GENERIC_SECTION(.exported_sym) __used \
__llext_sym_ ## sym_name = { \ __llext_sym_ ## sym_name = { \
.name = STRINGIFY(sym_name), .addr = (const void *)&sym_ident, \ .name = STRINGIFY(sym_name), .addr = (const void *)&sym_ident, \
} }
@ -135,7 +135,7 @@ struct llext_symtable {
#elif defined(CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID) #elif defined(CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
/* SLID-enabled LLEXT application: export symbols, names in separate section */ /* SLID-enabled LLEXT application: export symbols, names in separate section */
#define Z_EXPORT_SYMBOL_NAMED(sym_ident, sym_name) \ #define Z_EXPORT_SYMBOL_NAMED(sym_ident, sym_name) \
static const char Z_GENERIC_SECTION("llext_exports_strtab") __used \ static const char Z_GENERIC_SECTION(llext_exports_strtab) __used \
__llext_sym_name_ ## sym_name[] = STRINGIFY(sym_name); \ __llext_sym_name_ ## sym_name[] = STRINGIFY(sym_name); \
static const STRUCT_SECTION_ITERABLE(llext_const_symbol, \ static const STRUCT_SECTION_ITERABLE(llext_const_symbol, \
__llext_sym_ ## sym_name) = { \ __llext_sym_ ## sym_name) = { \

6
tests/subsys/llext/src/init_fini_ext.c
View file

@ -49,14 +49,14 @@ static void fini_fn(void)
number |= 4; number |= 4;
} }
static const void *const preinit_fn_ptrs[] __used Z_GENERIC_SECTION(".preinit_array") = { static const void *const preinit_fn_ptrs[] __used Z_GENERIC_SECTION(.preinit_array) = {
preinit_fn_1, preinit_fn_1,
preinit_fn_2 preinit_fn_2
}; };
static const void *const init_fn_ptrs[] __used Z_GENERIC_SECTION(".init_array") = { static const void *const init_fn_ptrs[] __used Z_GENERIC_SECTION(.init_array) = {
init_fn init_fn
}; };
static const void *const fini_fn_ptrs[] __used Z_GENERIC_SECTION(".fini_array") = { static const void *const fini_fn_ptrs[] __used Z_GENERIC_SECTION(.fini_array) = {
fini_fn fini_fn
}; };