Changeset d30e067 in mainline for uspace/srv/loader/main.c

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/srv/loader/main.c (modified) (1 diff)

uspace/srv/loader/main.c

@@ -300 +300 @@
 
 #ifdef CONFIG_RTLD
-        if (prog_info.env) {
-                pcb.tcb = rtld_tls_make(prog_info.env);
-        } else {
-                pcb.tcb = tls_make(prog_info.finfo.base);
-        }
+        assert(prog_info.env != NULL);
+        pcb.tcb = rtld_tls_make(prog_info.env);
 #else
         pcb.tcb = tls_make(prog_info.finfo.base);