Skip to content

LLEXT/Xtensa/detached: disable FLIX commands and link once #81145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabiobaltieri merged 2 commits into from
Nov 20, 2024
Merged

LLEXT/Xtensa/detached: disable FLIX commands and link once #81145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3675b
LLEXT: Xtensa: don't generate FLIX commands
lyakh Nov 8, 2024
8b153a3
LLEXT: no repeated linking with inline relocations
lyakh Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/compiler/xt-clang/target.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ set(LLEXT_APPEND_FLAGS ${LLEXT_APPEND_FLAGS}
else()
set(LLEXT_APPEND_FLAGS ${LLEXT_APPEND_FLAGS}
-ffreestanding
-mno-generate-flix
)
endif()
5 changes: 1 addition & 4 deletions subsys/llext/llext_link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,7 @@ static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr
arch_elf_relocate_global(ldr, ext, &rela, &sym, got_offset, link_addr);
break;
case STB_LOCAL:
if (ldr_parm->relocate_local) {
arch_elf_relocate_local(ldr, ext, &rela, &sym, got_offset,
ldr_parm);
}
arch_elf_relocate_local(ldr, ext, &rela, &sym, got_offset, ldr_parm);
}

LOG_DBG("symbol %s offset %#zx r-offset %#zx .text offset %#zx stb %u",
Expand Down
12 changes: 7 additions & 5 deletions subsys/llext/llext_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,11 +712,13 @@ int do_llext_load(struct llext_loader *ldr, struct llext *ext,
goto out;
}

LOG_DBG("Linking ELF...");
ret = llext_link(ldr, ext, ldr_parm);
if (ret != 0) {
LOG_ERR("Failed to link, ret %d", ret);
goto out;
if (ldr_parm->relocate_local) {
LOG_DBG("Linking ELF...");
ret = llext_link(ldr, ext, ldr_parm);
if (ret != 0) {
LOG_ERR("Failed to link, ret %d", ret);
goto out;
}
}

ret = llext_export_symbols(ldr, ext);
Expand Down
Loading