vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(ld.so): temporary fix

Browse Source 
Signed-off-by: Anhad Singh <andypython@protonmail.com>
This commit is contained in:
Anhad Singh
2024-12-05 23:34:16 +11:00
parent 32077ee341
commit de00d6c6b9
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ld_so/linker.rs
+11 -5
View File
@@ -206,14 +206,20 @@ impl Linker {
continue;
}
let dtv_idx = obj.tls_module_id - 1;
if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
// Below the TP
tcb.dtv_mut().unwrap()[obj.tls_module_id - 1] =
tcb_ptr.cast::<u8>().sub(obj.tls_offset);
tcb.dtv_mut().unwrap()[dtv_idx] = tcb_ptr.cast::<u8>().sub(obj.tls_offset);
} else {
// Above the TP
tcb.dtv_mut().unwrap()[obj.tls_module_id - 1] =
tcb_ptr.add(1).cast::<u8>().add(obj.tls_offset);
// FIMXE(andypython): Make it above the TP
//
// tcb.dtv_mut().unwrap()[obj.tls_module_id - 1] =
// tcb_ptr.add(1).cast::<u8>().add(obj.tls_offset);
//
// FIXME(andypython): https://gitlab.redox-os.org/redox-os/relibc/-/merge_requests/570#note_35788
tcb.dtv_mut().unwrap()[dtv_idx] =
tcb.tls_end.sub(tcb.tls_len).add(obj.tls_offset);
}
}