Changes in uspace/lib/c/generic/libc.c [17341d4:153c7a29] in mainline

File:

• uspace/lib/c/generic/libc.c (modified) (4 diffs)

uspace/lib/c/generic/libc.c

@@ -41 +41 @@
  */
 
+#include <errno.h>
 #include <libc.h>
 #include <stdlib.h>
@@ -68 +69 @@
         __malloc_init();
         
+        /* Save the PCB pointer */
+        __pcb = (pcb_t *) pcb_ptr;
+        
+#ifdef CONFIG_RTLD
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (rtld_t *) __pcb->rtld_runtime;
+        } else {
+                if (rtld_init_static() != EOK)
+                        abort();
+        }
+#endif
+        
         fibril_t *fibril = fibril_setup();
         if (fibril == NULL)
@@ -74 +87 @@
         __tcb_set(fibril->tcb);
         
-        /* Save the PCB pointer */
-        __pcb = (pcb_t *) pcb_ptr;
         
 #ifdef FUTEX_UPGRADABLE
@@ -89 +100 @@
         char **argv;
         
-#ifdef CONFIG_RTLD
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
-                runtime_env = (rtld_t *) __pcb->rtld_runtime;
-        }
-#endif
         /*
          * Get command line arguments and initialize