Changeset 32573ff in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

File:

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

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

@@ -63 +63 @@
         module_process_pre_arch(m);
 
-        if (m->dyn.plt_rel == DT_REL) {
-                DPRINTF("table type DT_REL\n");
-                if (m->dyn.rel != NULL) {
-                        DPRINTF("non-empty\n");
-                        rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+        /* jmp_rel table */
+        if (m->dyn.jmp_rel != NULL) {
+                DPRINTF("jmp_rel table\n");
+                if (m->dyn.plt_rel == DT_REL) {
+                        DPRINTF("jmp_rel table type DT_REL\n");
+                        rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
+                } else {
+                        assert(m->dyn.plt_rel == DT_RELA);
+                        DPRINTF("jmp_rel table type DT_RELA\n");
+                        rela_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
                 }
-                /* FIXME: this seems wrong */
-                if (m->dyn.jmp_rel != NULL) {
-                DPRINTF("table type jmp-rel\n");
-                        DPRINTF("non-empty\n");
-                        rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
-                }
-        } else { /* (m->dyn.plt_rel == DT_RELA) */
-                DPRINTF("table type DT_RELA\n");
-                if (m->dyn.rela != NULL) {
-                        DPRINTF("non-empty\n");
-                        rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
-                }
+        }
+
+        /* rel table */
+        if (m->dyn.rel != NULL) {
+                DPRINTF("rel table\n");
+                rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+        }
+
+        /* rela table */
+        if (m->dyn.rela != NULL) {
+                DPRINTF("rela table\n");
+                rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
         }
 
@@ -113 +118 @@
                 }
         }
-        
+
         return NULL; /* Not found */
 }
@@ -123 +128 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(rtld_t *rtld, const char *name)
+module_t *module_load(rtld_t *rtld, const char *name, mlflags_t flags)
 {
         elf_finfo_t info;
@@ -129 +134 @@
         module_t *m;
         int rc;
-        
+
         m = calloc(1, sizeof(module_t));
         if (m == NULL) {
@@ -138 +143 @@
         m->rtld = rtld;
         m->id = rtld_get_next_id(rtld);
+
+        if ((flags & mlf_local) != 0)
+                m->local = true;
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -190 +198 @@
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m)
+void module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -235 +243 @@
                         dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(m->rtld, dep_name);
-                                module_load_deps(dm);
+                                dm = module_load(m->rtld, dep_name, flags);
+                                module_load_deps(dm, flags);
                         }