From 976ca7893fc5a4dbf6b05b60abf8ae2b786dcc61 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 11 Sep 2022 14:07:05 -0600
Subject: [PATCH] Use current Tcb if it is set even if no linker objects are
 loaded

---
 src/ld_so/linker.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index 210f8cdbba..53ce3e5e4e 100644
--- a/src/ld_so/linker.rs
+++ b/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()?;