Changeset 2c4e1cc in mainline for uspace/lib/c/generic/tls.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/tls.c (modified) (6 diffs)

uspace/lib/c/generic/tls.c

@@ -41 +41 @@
 #include <stdlib.h>
 #include <str.h>
+#include <elf/elf.h>
 
 #ifdef CONFIG_RTLD
@@ -52 +53 @@
                 return runtime_env->tls_size;
 #endif
-        return &_tbss_end - &_tdata_start;
+
+        const elf_segment_header_t *tls =
+            elf_get_phdr(__executable_start, PT_TLS);
+        return tls->p_memsz;
 }
 
@@ -73 +77 @@
         void *data;
         tcb_t *tcb;
-        size_t tls_size = &_tbss_end - &_tdata_start;
 
 #ifdef CONFIG_RTLD
@@ -80 +83 @@
 #endif
 
-        tcb = tls_alloc_arch(&data, tls_size);
-        if (!tcb)
+        const elf_segment_header_t *tls =
+            elf_get_phdr(__executable_start, PT_TLS);
+        if (tls == NULL)
                 return NULL;
+
+        uintptr_t bias = elf_get_bias(__executable_start);
+
+        tcb = tls_alloc_arch(&data, tls->p_memsz);
 
         /*
          * Copy thread local data from the initialization image.
          */
-        memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start);
+        memcpy(data, (void *)(tls->p_vaddr + bias), tls->p_filesz);
         /*
          * Zero out the thread local uninitialized data.
          */
-        memset(data + (&_tbss_start - &_tdata_start), 0,
-            &_tbss_end - &_tbss_start);
+        memset(data + tls->p_filesz, 0, tls->p_memsz - tls->p_filesz);
 
         return tcb;
@@ -151 +158 @@
         tcb_t *tcb;
 
-        size = ALIGN_UP(size, &_tls_alignment);
-        *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
+        uintptr_t align = elf_get_phdr(__executable_start, PT_TLS)->p_align;
+
+        size = ALIGN_UP(size, align);
+        *data = memalign(align, sizeof(tcb_t) + size);
         if (*data == NULL)
                 return NULL;
@@ -171 +180 @@
 void tls_free_variant_2(tcb_t *tcb, size_t size)
 {
-        size = ALIGN_UP(size, &_tls_alignment);
+        uintptr_t align = elf_get_phdr(__executable_start, PT_TLS)->p_align;
+        size = ALIGN_UP(size, align);
         void *start = ((void *) tcb) - size;
         free(start);