Changeset 153c7a29 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2016-05-22T17:46:10Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0dc2fec

Parents:

2112a79

Message:

Since dlopen() sets up runtime_env, we would no longer use the static TLS. Thus set up runtime_env right away and convert static TLS to dynamic TLS.

File:

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

uspace/lib/c/generic/libc.c

@@ -41 +41 @@
  */
 
+#include <errno.h>
 #include <libc.h>
 #include <stdlib.h>
@@ -65 +66 @@
 void __main(void *pcb_ptr)
 {
+        /* Initialize user task run-time environment */
+        __malloc_init();
+        
         /* Save the PCB pointer */
         __pcb = (pcb_t *) pcb_ptr;
@@ -71 +75 @@
         if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
                 runtime_env = (rtld_t *) __pcb->rtld_runtime;
+        } else {
+                if (rtld_init_static() != EOK)
+                        abort();
         }
 #endif
-        /* Initialize user task run-time environment */
-        __malloc_init();
         
         fibril_t *fibril = fibril_setup();