Changeset 153c7a29 in mainline for uspace/lib/c/generic/rtld/rtld.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/rtld/rtld.c (modified) (3 diffs)

uspace/lib/c/generic/rtld/rtld.c

@@ -45 +45 @@
 
 /** Initialize the runtime linker for use in a statically-linked executable. */
-void rtld_init_static(void)
-{
+int rtld_init_static(void)
+{
+        int rc;
+
         runtime_env = &rt_env_static;
         list_initialize(&runtime_env->modules);
@@ -52 +54 @@
         runtime_env->next_bias = 0x2000000;
         runtime_env->program = NULL;
+        runtime_env->next_id = 1;
+
+        rc = module_create_static_exec(runtime_env, NULL);
+        if (rc != EOK)
+                return rc;
+
+        modules_process_tls(runtime_env);
+
+        return EOK;
 }
 
@@ -98 +109 @@
         prog->tls_align = p_info->tls.tls_align;
 
-        printf("prog tdata at %p size %zu, tbss size %zu\n",
+        DPRINTF("prog tdata at %p size %zu, tbss size %zu\n",
             prog->tdata, prog->tdata_size, prog->tbss_size);