Use current Tcb if it is set even if no linker objects are loaded

This commit is contained in:
Jeremy Soller
2022-09-11 14:07:05 -06:00
parent 367be58666
commit 976ca7893f
+3 -4
View File
@@ -166,10 +166,9 @@ impl Linker {
)?;
unsafe {
let tcb = if self.objects.len() == 0 {
Tcb::new(self.tls_size)?
} else {
Tcb::current().unwrap()
let tcb = match Tcb::current() {
Some(some) => some,
None => Tcb::new(self.tls_size)?,
};
tcb.append_masters(tcb_masters);
tcb.copy_masters()?;