Changeset f356618 in mainline for uspace/lib/c/generic/rtld/symbol.c

Timestamp:

2016-05-22T21:05:55Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3364b7c

Parents:

af2254ec (diff), 3a9414e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge dynamic linking support for thread local storage.

File:

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

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

@@ -249 +249 @@
 }
 
-void *symbol_get_addr(elf_symbol_t *sym, module_t *m)
-{
-        if (sym->st_shndx == SHN_ABS) {
+/** Get symbol address.
+ *
+ * @param sym Symbol
+ * @param m Module contaning the symbol
+ * @param tcb TCB of the thread whose thread-local variable instance should
+ *            be returned. If @a tcb is @c NULL then @c NULL is returned for
+ *            thread-local variables.
+ *
+ * @return Symbol address
+ */
+void *symbol_get_addr(elf_symbol_t *sym, module_t *m, tcb_t *tcb)
+{
+        if (ELF_ST_TYPE(sym->st_info) == STT_TLS) {
+                if (tcb == NULL)
+                        return NULL;
+                return rtld_tls_get_addr(m->rtld, tcb, m->id, sym->st_value);
+        } else if (sym->st_shndx == SHN_ABS) {
                 /* Do not add bias to absolute symbols */
                 return (void *) sym->st_value;