Changeset 2c4e1cc in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2018-04-04T17:01:18Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

5754c31e

Parents:

1433ecda

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-03 16:54:34)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-04 17:01:18)

Message:

Define TLS consistently in linker scripts, and remove nonstandard symbols.

Read the program header to find TLS instead.

File:

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

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

@@ -70 +70 @@
         module->local = true;
 
-        module->tdata = &_tdata_start;
-        module->tdata_size = &_tdata_end - &_tdata_start;
-        module->tbss_size = &_tbss_end - &_tbss_start;
-        module->tls_align = (uintptr_t)&_tls_alignment;
+        const elf_segment_header_t *tls =
+            elf_get_phdr(__executable_start, PT_TLS);
+        uintptr_t bias = elf_get_bias(__executable_start);
+
+        module->tdata = (void *) (tls->p_vaddr + bias);
+        module->tdata_size = tls->p_filesz;
+        module->tbss_size = tls->p_memsz - tls->p_filesz;
+        module->tls_align = tls->p_align;
 
         list_append(&module->modules_link, &rtld->modules);