Changeset 32573ff in mainline for uspace/lib/c/generic/dlfcn.c

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

File:

• uspace/lib/c/generic/dlfcn.c (modified) (2 diffs)

uspace/lib/c/generic/dlfcn.c

@@ -60 +60 @@
         if (m == NULL) {
                 printf("NULL. module_load('%s')\n", path);
-                m = module_load(runtime_env, path);
+                m = module_load(runtime_env, path, mlf_local);
                 printf("module_load_deps(m)\n");
-                module_load_deps(m);
+                module_load_deps(m, mlf_local);
                 /* Now relocate. */
                 printf("module_process_relocs(m)\n");
@@ -82 +82 @@
 
         printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
-        sd = symbol_bfs_find(sym_name, (module_t *) mod, ssf_none, &sm);
+        sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {
                 return symbol_get_addr(sd, sm);