Changeset 17341d4 in mainline for uspace/lib/c/generic/rtld/symbol.c

Timestamp:

2016-04-20T17:25:48Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dc0d8b52

Parents:

13dfa3f9

Message:

Move rtld internals out of loader. Stop misusing rtld instance from current environment for loading dynamically linked executables.

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (3 diffs)

uspace/lib/c/generic/rtld/symbol.c

@@ -39 +39 @@
 
 #include <elf/elf.h>
+#include <rtld/module.h>
 #include <rtld/rtld.h>
 #include <rtld/rtld_debug.h>
@@ -132 +133 @@
 
         /* Mark all vertices (modules) as unvisited */  
-        modules_untag();
+        modules_untag(start->rtld);
 
         /* Insert root (the program) into the queue and tag it */
@@ -219 +220 @@
         /* Not DT_SYMBOLIC or no match. Now try other locations. */
 
-        if (runtime_env->program) {
+        if (origin->rtld->program) {
                 /* Program is dynamic -- start with program as root. */
-                return symbol_bfs_find(name, runtime_env->program, flags, mod);
+                return symbol_bfs_find(name, origin->rtld->program, flags, mod);
         } else {
                 /* Program is static -- start with @a origin as root. */