dyld/rebind: support rela generation with nac3ld
This commit is contained in:
parent
690c6374ee
commit
5fba1c8bf4
|
@ -159,23 +159,36 @@ pub fn relocate<R: Relocatable>(
|
||||||
pub fn rebind(
|
pub fn rebind(
|
||||||
arch: Arch, lib: &Library, name: &[u8], value: Elf32_Word
|
arch: Arch, lib: &Library, name: &[u8], value: Elf32_Word
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
for rela in lib.pltrel() {
|
fn rebind_symbol_to_value<R: Relocatable>(
|
||||||
let rel_type = RelType::new(arch, rela.type_info())
|
arch: Arch, lib: &Library,name: &[u8], value: Elf32_Word, relocs: &[R]
|
||||||
.ok_or("unsupported relocation type")?;
|
) -> Result<(), Error> {
|
||||||
match rel_type {
|
for reloc in relocs {
|
||||||
RelType::LookupAbs => {
|
let rel_type = RelType::new(arch, reloc.type_info())
|
||||||
let sym = lib.symtab().get(ELF32_R_SYM(rela.r_info) as usize)
|
.ok_or("unsupported relocation type")?;
|
||||||
.ok_or("symbol out of bounds of symbol table")?;
|
match rel_type {
|
||||||
let sym_name = lib.name_starting_at(sym.st_name as usize)?;
|
RelType::LookupAbs => {
|
||||||
|
let sym = lib.symtab().get(reloc.sym_info() as usize)
|
||||||
|
.ok_or("symbol out of bounds of symbol table")?;
|
||||||
|
let sym_name = lib.name_starting_at(sym.st_name as usize)?;
|
||||||
|
|
||||||
if sym_name == name {
|
if sym_name == name {
|
||||||
lib.image.write(rela.offset(), value)?
|
lib.image.write(reloc.offset(), value)?
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// No associated symbols for other relocation types.
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
// No associated symbols for other relocation types.
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if lib.pltrel().is_empty() {
|
||||||
|
rebind_symbol_to_value(arch, lib, name, value, lib.rela())?;
|
||||||
|
} else {
|
||||||
|
rebind_symbol_to_value(arch, lib, name, value, lib.pltrel())?;
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME: the cache maintainance operations may be more than enough,
|
// FIXME: the cache maintainance operations may be more than enough,
|
||||||
// may cause performance degradation.
|
// may cause performance degradation.
|
||||||
dcci_slice(lib.image.data);
|
dcci_slice(lib.image.data);
|
||||||
|
|
Loading…
Reference in New Issue