Changeset 153c7a29 in mainline for uspace/lib/c/generic/rtld

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.

Location:

uspace/lib/c/generic/rtld

Files:

• module.c (modified) (2 diffs)
• rtld.c (modified) (3 diffs)

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

@@ -49 +49 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
+
+/** Create module for static executable.
+ *
+ * @param rtld Run-time dynamic linker
+ * @param rmodule Place to store pointer to new module or @c NULL
+ * @return EOK on success, ENOMEM if out of memory
+ */
+int module_create_static_exec(rtld_t *rtld, module_t **rmodule)
+{
+        module_t *module;
+
+        module = calloc(1, sizeof(module_t));
+        if (module == NULL)
+                return ENOMEM;
+
+        module->id = rtld_get_next_id(rtld);
+        module->dyn.soname = "[program]";
+
+        module->rtld = rtld;
+        module->exec = true;
+        module->local = true;
+
+        module->tdata = &_tdata_start;
+        module->tdata_size = &_tdata_end - &_tdata_start;
+        module->tbss_size = &_tbss_end - &_tbss_start;
+        module->tls_align = (uintptr_t)&_tls_alignment;
+
+        list_append(&module->modules_link, &rtld->modules);
+
+        if (rmodule != NULL)
+                *rmodule = module;
+        return EOK;
+}
 
 /** (Eagerly) process all relocation tables in a module.
@@ -191 +224 @@
         m->tls_align = info.tls.tls_align;
 
-        printf("tdata at %p size %zu, tbss size %zu\n",
+        DPRINTF("tdata at %p size %zu, tbss size %zu\n",
             m->tdata, m->tdata_size, m->tbss_size);
 

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);