Changeset e2f26002 in mainline for uspace/lib/c/generic/rtld

Timestamp:

2016-05-17T17:15:13Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d2bb25e7

Parents:

bab0f42

Message:

symbol_get_addr() must treat thread-local variables differently than normal variables.

Location:

uspace/lib/c/generic/rtld

Files:

• rtld.c (modified) (1 diff)
• symbol.c (modified) (1 diff)

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

@@ -187 +187 @@
 }
 
-void *rtld_tls_get_addr(rtld_t *rtld, void *tls, unsigned long mod_id,
+void *rtld_tls_get_addr(rtld_t *rtld, unsigned long mod_id,
     unsigned long offset)
 {
         module_t *m;
+        uint8_t *tls;
 
         m = module_by_id(rtld, mod_id);
         assert(m != NULL);
 
+        if (!link_used(&m->imodules_link)) {
+                printf("module '%s' is not initial. aborting.\n",
+                    m->dyn.soname);
+                abort();
+        }
+
+        tls = tls_get();
         return tls + m->ioffs + offset;
 }

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

@@ -251 +251 @@
 void *symbol_get_addr(elf_symbol_t *sym, module_t *m)
 {
-        if (sym->st_shndx == SHN_ABS) {
+        if (ELF_ST_TYPE(sym->st_info) == STT_TLS) {
+                return rtld_tls_get_addr(m->rtld, m->id, sym->st_value);
+        } else if (sym->st_shndx == SHN_ABS) {
                 /* Do not add bias to absolute symbols */
                 return (void *) sym->st_value;