Changeset 91e4567 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2016-05-06T15:21:22Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0dc9a474

Parents:

7c4b26c

Message:

runtime_env must be set early, before calling fibril_setup.

File:

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

uspace/lib/c/generic/libc.c

@@ -65 +65 @@
 void __main(void *pcb_ptr)
 {
+        /* 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;
+        }
+#endif
         /* Initialize user task run-time environment */
         __malloc_init();
@@ -74 +82 @@
         __tcb_set(fibril->tcb);
         
-        /* Save the PCB pointer */
-        __pcb = (pcb_t *) pcb_ptr;
         
 #ifdef FUTEX_UPGRADABLE
@@ -89 +95 @@
         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