Changeset f356618 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2016-05-22T21:05:55Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3364b7c

Parents:

af2254ec (diff), 3a9414e (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 dynamic linking support for thread local storage.

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