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

Timestamp:

2019-07-16T15:07:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2cc569a3, 9fb280c

Parents:

fa603e99

git-author:

Jiri Svoboda <jiri@…> (2019-07-15 17:03:31)

git-committer:

Jiri Svoboda <jiri@…> (2019-07-16 15:07:01)

Message:

Dynamic linking on IA-64 (WIP)

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());
         }