Changeset 40d3604 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2018-04-30T20:12:50Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

4c5f04f (diff), 64d38cd (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-04-30 20:12:50)

git-committer:

GitHub <noreply@…> (2018-04-30 20:12:50)

Message:

Merge 64d38cd33ec6817c3a5fdd1a7da6d705b0d9d3a2 into 4c5f04f66aa0d34ff3bbed6e9abebf85f59723fb

File:

• uspace/lib/c/generic/rtld/module.c (modified) (1 diff)

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

@@ -202 +202 @@
         str_cpy(name_buf + 5, NAME_BUF_SIZE - 5, name);
 
-        /* FIXME: need to real allocation of address space */
-        m->bias = rtld->next_bias;
-        rtld->next_bias += 0x100000;
 
         DPRINTF("filename:'%s'\n", name_buf);
-        DPRINTF("load '%s' at 0x%zx\n", name_buf, m->bias);
-
-        rc = elf_load_file_name(name_buf, m->bias, ELDF_RW, &info);
+
+        rc = elf_load_file_name(name_buf, ELDF_RW, &info);
         if (rc != EE_OK) {
                 printf("Failed to load '%s'\n", name_buf);
                 exit(1);
         }
+
+        m->bias = elf_get_bias(info.base);
+
+        DPRINTF("loaded '%s' at 0x%zx\n", name_buf, m->bias);
 
         if (info.dynamic == NULL) {