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

uspace/lib/c/generic/dlfcn.c

@@ -49 +49 @@
         module_t *m;
 
-        if (runtime_env == NULL) {
-                printf("Dynamic linker not set up -- initializing.\n");
-                rtld_init_static();
-        }
-
-        printf("dlopen(\"%s\", %d)\n", path, flag);
-
-        printf("module_find('%s')\n", path);
         m = module_find(runtime_env, path);
         if (m == NULL) {
-                printf("NULL. module_load('%s')\n", path);
                 m = module_load(runtime_env, path, mlf_local);
-                printf("module_load_deps(m)\n");
                 module_load_deps(m, mlf_local);
                 /* Now relocate. */
-                printf("module_process_relocs(m)\n");
                 module_process_relocs(m);
-        } else {
-                printf("not NULL\n");
         }
 
@@ -81 +68 @@
         module_t *sm;
 
-        printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
         sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {
-                return symbol_get_addr(sd, sm);
+                return symbol_get_addr(sd, sm, __tcb_get());
         }