Skip to content

rel make: Resolve imports against RELs before the DOL #157

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
encounter merged 1 commit into from
Oct 28, 2026
Merged

rel make: Resolve imports against RELs before the DOL #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/cmd/rel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,11 @@ fn make(args: MakeArgs) -> Result<()> {
// Create symbol map
let start = Instant::now();
let mut symbol_map = FxHashMap::<&[u8], (u32, SymbolIndex)>::default();
for module_info in modules.iter() {
// Leave the DOL for last, so in case a symbol has multiple definitions
// we resolve to one in a REL
let (dol_modules, rel_modules): (Vec<_>, Vec<_>) =
modules.iter().partition(|m| m.module_id == 0);
for module_info in rel_modules.into_iter().chain(dol_modules) {
let _span = info_span!("file", path = %module_info.path).entered();
for symbol in module_info.file.symbols() {
if symbol.scope() == object::SymbolScope::Dynamic {
Expand Down
Loading