Changeset 2eadda9 in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2018-07-11T17:45:30Z (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:

99d3123

Parents:

c2c4127

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:08:12)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:45:30)

Message:

Remove undefined references to main program from shared libc.

File:

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

uspace/lib/c/generic/tls.c

@@ -45 +45 @@
 #include <elf/elf.h>
 
+#include "private/libc.h"
+
 #ifdef CONFIG_RTLD
 #include <rtld/rtld.h>
@@ -61 +63 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
 
         if (tls == NULL)
@@ -88 +90 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
         if (tls == NULL)
                 return NULL;
 
-        uintptr_t bias = elf_get_bias(__executable_start);
+        uintptr_t bias = elf_get_bias(__progsymbols.elfstart);
         size_t align = max(tls->p_align, _Alignof(tcb_t));
 
@@ -128 +130 @@
 #endif
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
 
         assert(tls != NULL);