Changeset f356618 in mainline for uspace/lib/c/include/rtld

Timestamp:

2016-05-22T21:05:55Z (10 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.

Location:

uspace/lib/c/include/rtld

Files:

• module.h (modified) (1 diff)
• rtld.h (modified) (1 diff)
• symbol.h (modified) (2 diffs)

uspace/lib/c/include/rtld/module.h

@@ -42 +42 @@
 #include <types/rtld/rtld.h>
 
+extern int module_create_static_exec(rtld_t *, module_t **);
 extern void module_process_relocs(module_t *);
 extern module_t *module_find(rtld_t *, const char *);
 extern module_t *module_load(rtld_t *, const char *, mlflags_t);
 extern void module_load_deps(module_t *, mlflags_t);
+extern module_t *module_by_id(rtld_t *, unsigned long);
 
 extern void modules_process_relocs(rtld_t *, module_t *);
+extern void modules_process_tls(rtld_t *);
 extern void modules_untag(rtld_t *);
 

uspace/lib/c/include/rtld/rtld.h

@@ -41 +41 @@
 
 #include <rtld/dynamic.h>
+#include <tls.h>
 #include <types/rtld/rtld.h>
 
 extern rtld_t *runtime_env;
 
-extern void rtld_init_static(void);
+extern int rtld_init_static(void);
 extern int rtld_prog_process(elf_finfo_t *, rtld_t **);
+extern tcb_t *rtld_tls_make(rtld_t *);
+extern unsigned long rtld_get_next_id(rtld_t *);
+extern void *rtld_tls_get_addr(rtld_t *, tcb_t *, unsigned long, unsigned long);
 
 #endif

uspace/lib/c/include/rtld/symbol.h

@@ -38 +38 @@
 #include <elf/elf.h>
 #include <rtld/rtld.h>
+#include <tls.h>
 
 /** Symbol search flags */
@@ -50 +51 @@
 extern elf_symbol_t *symbol_def_find(const char *, module_t *,
     symbol_search_flags_t, module_t **);
-extern void *symbol_get_addr(elf_symbol_t *, module_t *);
+extern void *symbol_get_addr(elf_symbol_t *, module_t *, tcb_t *);
 
 #endif