Changeset 29405ac in mainline for uspace/lib/c/generic/rtld/rtld.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/rtld.c (modified) (5 diffs)

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

@@ -95 +95 @@
         prog->tdata_size = p_info->tls.tdata_size;
         prog->tbss_size = p_info->tls.tbss_size;
+        prog->tls_align = p_info->tls.tls_align;
 
         printf("prog tdata at %p size %zu, tbss size %zu\n",
@@ -116 +117 @@
         module_load_deps(prog, 0);
 
+        /* Compute static TLS size */
+        modules_process_tls(env);
+
         /*
          * Now relocate/link all modules together.
@@ -124 +128 @@
         modules_process_relocs(env, prog);
 
-        modules_process_tls(env);
-
         *rre = env;
         return EOK;
@@ -149 +151 @@
          */
 
+#ifdef CONFIG_TLS_VARIANT_1
+        /*
+         * Ascending addresses
+         */
         offset = 0;
         list_foreach(rtld->modules, modules_link, module_t, m) {
@@ -157 +163 @@
                 offset += m->tbss_size;
         }
+#else /* CONFIG_TLS_VARIANT_2 */
+        /*
+         * Descending addresses
+         */
+        offset = 0;
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
+                offset += m->tbss_size;
+                memset(data + rtld->tls_size - offset, 0, m->tbss_size);
+                offset += m->tdata_size;
+                memcpy(data + rtld->tls_size - offset, m->tdata, m->tdata_size);
+        }
+#endif
 
         return tcb;