M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests 1 Releases Wiki Activity

libdyld: fix pltrel_sz, remove debug output

Browse Source
This commit is contained in:
Astro 2020-05-07 01:44:26 +02:00
parent 90faeb6fa2
commit d08f4552ab
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libdyld/src/image.rs
View File

@ -155,7 +155,7 @@ impl Image {
hash_chain: nbucket..nbucket + nchain, hash_chain: nbucket..nbucket + nchain,
rel: rel_off..rel_off + rel_sz, rel: rel_off..rel_off + rel_sz,
rela: rela_off..rela_off + rela_sz, rela: rela_off..rela_off + rela_sz,
pltrel: pltrel_off..pltrel_off + rela_sz, pltrel: pltrel_off..pltrel_off + pltrel_sz,
}) })
} }

4
src/libdyld/src/reloc.rs
View File

@ -1,5 +1,5 @@
use alloc::string::String; use alloc::string::String;
use log::{debug, trace}; use log::trace;
use super::{ use super::{
Arch, Arch,
elf::*, elf::*,
@ -92,7 +92,6 @@ pub fn relocate<R: Relocatable>(
arch: Arch, lib: &Library, arch: Arch, lib: &Library,
rel: &R, resolve: &dyn Fn(&[u8]) -> Option<Elf32_Word> rel: &R, resolve: &dyn Fn(&[u8]) -> Option<Elf32_Word>
) -> Result<(), Error> { ) -> Result<(), Error> {
// debug!("rel r_offset={:08X} r_info={:08X} r_addend={:08X}", rel.offset(), rel.r_info, rela.r_addend);
let sym; let sym;
if rel.sym_info() == 0 { if rel.sym_info() == 0 {
sym = None; sym = None;
@ -132,6 +131,5 @@ pub fn relocate<R: Relocatable>(
} }
} }
debug!("rel_type={:?} write at {:08X} value {:08X}", rel_type, rel.offset(), value);
lib.image.write(rel.offset(), value) lib.image.write(rel.offset(), value)
} }