Browse Source

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

Jeremy Soller 2 years ago
parent
commit
976ca7893f
1 changed files with 3 additions and 4 deletions
  1. 3 4
      src/ld_so/linker.rs

+ 3 - 4
src/ld_so/linker.rs

@@ -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()?;