Changeset d30e067 in mainline for uspace/lib/c/generic/libc.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/lib/c/generic/libc.c (modified) (1 diff)

uspace/lib/c/generic/libc.c

@@ -96 +96 @@
 
 #ifdef CONFIG_RTLD
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+        if (__pcb == NULL) {
+                /*
+                 * A binary loaded by kernel, not the loader.
+                 * Noop - code loaded by kernel doesn't need RTLD.
+                 */
+        } else {
+                assert(__pcb->rtld_runtime != NULL);
                 runtime_env = (rtld_t *) __pcb->rtld_runtime;
-        } else {
-                if (rtld_init_static() != EOK)
-                        abort();
         }
 #endif