Skip to content
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

Jump to bottom

Handle R_X86_64_DTPOFF64 #655

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Handle R_X86_64_DTPOFF64 #655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e979d
Handle R_X86_64_DTPOFF64
mikusp Feb 16, 2024
e0a89cb
Merge branch 'main' into dtpoff64_relocation
SuchAFuriousDeath Feb 24, 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
13 changes: 13 additions & 0 deletions src/kernel/src/rtld/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,19 @@ impl<E: ExecutionEngine> RuntimeLinker<E> {

(Relocated::Tls((md, index)), value)
}
Relocation::R_X86_64_DTPOFF64 => {
let md = match resolver.resolve_with_local(md, sym, symflags) {
Some((md, _)) => md,
None => continue,
};

let sym = md.symbol(sym).unwrap();
let value = unsafe { read_unaligned::<usize>(target.as_ptr().cast()) };

let relocated = (value + sym.value()).wrapping_add_signed(addend);

(Relocated::Data((md, relocated)), relocated)
}
v => return Err(RelocateError::UnsupportedRela(md.path().to_owned(), v)),
};

Expand Down