Changeset e28175d in mainline for uspace/lib/c/generic/dlfcn.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

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

uspace/lib/c/generic/dlfcn.c

@@ -45 +45 @@
 #include <rtld/module.h>
 #include <rtld/rtld.h>
+#include <rtld/rtld_arch.h>
 #include <rtld/symbol.h>
 
@@ -79 +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());
         }