Changeset bab0f42 in mainline for uspace/lib/c/generic/rtld/rtld.c

Timestamp:

2016-05-16T18:38:31Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2f26002

Parents:

29405ac

Message:

Make sure we only go through initial modules when constructing TLS.

File:

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

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

@@ -49 +49 @@
         runtime_env = &rt_env_static;
         list_initialize(&runtime_env->modules);
+        list_initialize(&runtime_env->imodules);
         runtime_env->next_bias = 0x2000000;
         runtime_env->program = NULL;
@@ -102 +103 @@
         /* Initialize list of loaded modules */
         list_initialize(&env->modules);
+        list_initialize(&env->imodules);
         list_append(&prog->modules_link, &env->modules);
 
@@ -156 +158 @@
          */
         offset = 0;
-        list_foreach(rtld->modules, modules_link, module_t, m) {
+        list_foreach(rtld->imodules, imodules_link, module_t, m) {
                 assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
                 memcpy(data + offset, m->tdata, m->tdata_size);
@@ -168 +170 @@
          */
         offset = 0;
-        list_foreach(rtld->modules, modules_link, module_t, m) {
+        list_foreach(rtld->imodules, imodules_link, module_t, m) {
                 assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
                 offset += m->tbss_size;