Changes in uspace/lib/c/generic/rtld/module.c [153c7a29:5035ba05] in mainline

File:

• uspace/lib/c/generic/rtld/module.c (modified) (7 diffs)

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

@@ -37 +37 @@
 #include <adt/list.h>
 #include <elf/elf_load.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <loader/pcb.h>
@@ -49 +48 @@
 #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.
@@ -169 +135 @@
 
         m = calloc(1, sizeof(module_t));
-        if (m == NULL) {
+        if (!m) {
                 printf("malloc failed\n");
                 exit(1);
@@ -175 +141 @@
 
         m->rtld = rtld;
-        m->id = rtld_get_next_id(rtld);
-
         if ((flags & mlf_local) != 0)
                 m->local = true;
@@ -217 +181 @@
         /* Insert into the list of loaded modules */
         list_append(&m->modules_link, &rtld->modules);
-
-        /* Copy TLS info */
-        m->tdata = info.tls.tdata;
-        m->tdata_size = info.tls.tdata_size;
-        m->tbss_size = info.tls.tbss_size;
-        m->tls_align = info.tls.tls_align;
-
-        DPRINTF("tdata at %p size %zu, tbss size %zu\n",
-            m->tdata, m->tdata_size, m->tbss_size);
 
         return m;
@@ -288 +243 @@
 }
 
-/** Find module structure by ID. */
-module_t *module_by_id(rtld_t *rtld, unsigned long id)
-{
-        list_foreach(rtld->modules, modules_link, module_t, m) {
-                if (m->id == id)
-                        return m;
-        }
-
-        return NULL;
-}
-
 /** Process relocations in modules.
  *
@@ -316 +260 @@
 }
 
-void modules_process_tls(rtld_t *rtld)
-{
-#ifdef CONFIG_TLS_VARIANT_1
-        list_foreach(rtld->modules, modules_link, module_t, m) {
-                m->ioffs = rtld->tls_size;
-                list_append(&m->imodules_link, &rtmd->imodules);
-                rtld->tls_size += m->tdata_size + m->tbss_size;
-        }
-#else /* CONFIG_TLS_VARIANT_2 */
-        size_t offs;
-
-        list_foreach(rtld->modules, modules_link, module_t, m) {
-                rtld->tls_size += m->tdata_size + m->tbss_size;
-        }
-
-        offs = 0;
-        list_foreach(rtld->modules, modules_link, module_t, m) {
-                offs += m->tdata_size + m->tbss_size;
-                m->ioffs = rtld->tls_size - offs;
-                list_append(&m->imodules_link, &rtld->imodules);
-        }
-#endif
-}
-
 /** Clear BFS tags of all modules.
  */