Changeset 3e828ea in mainline for uspace/lib/c/generic/dlfcn.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

uspace/lib/c/generic/dlfcn.c

@@ -35 +35 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +45 @@
 #include <rtld/module.h>
 #include <rtld/rtld.h>
+#include <rtld/rtld_arch.h>
 #include <rtld/symbol.h>
 
@@ -53 +55 @@
         if (m == NULL) {
                 m = module_load(runtime_env, path, mlf_local);
-                module_load_deps(m, mlf_local);
+                if (m == NULL) {
+                        return NULL;
+                }
+
+                if (module_load_deps(m, mlf_local) != EOK) {
+                        return NULL;
+                }
+
                 /* Now relocate. */
                 module_process_relocs(m);
@@ -71 +80 @@
         sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {
-                return symbol_get_addr(sd, sm, __tcb_get());
+                if (elf_st_type(sd->st_info) == STT_FUNC)
+                        return func_get_addr(sd, sm);
+                else
+                        return symbol_get_addr(sd, sm, __tcb_get());
         }