Changeset 29405ac in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-05-16T18:10:00Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bab0f42

Parents:

0dc9a474

Message:

DTPMOD relocations with null symbol name should return the current module index. Implement TPOFF relocations. dltest -n to not run dlfcn tests. Now dltest -n works like a charm. Place TLS images in descending order for variant II just to be safe. Propagate TLS alignment info.

File:

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

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

@@ -189 +189 @@
         m->tdata_size = info.tls.tdata_size;
         m->tbss_size = info.tls.tbss_size;
+        m->tls_align = info.tls.tls_align;
 
         printf("tdata at %p size %zu, tbss size %zu\n",
@@ -284 +285 @@
 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;
                 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;
+        }
+#endif
 }