Skip to content
Snippets Groups Projects
Commit 976ca789 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

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

parent 367be586
No related branches found
No related tags found
No related merge requests found
Pipeline #10616 failed
......@@ -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()?;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment