Changeset 32573ff in mainline for uspace/lib/c/include/rtld

Timestamp:

2016-05-02T20:58:16Z (9 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.

Location:

uspace/lib/c/include/rtld

Files:

• dynamic.h (modified) (2 diffs)
• module.h (modified) (1 diff)
• symbol.h (modified) (1 diff)

uspace/lib/c/include/rtld/dynamic.h

@@ -48 +48 @@
  */
 typedef struct dyn_info {
-        /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
-        int plt_rel;
-
         /** Relocation table without explicit addends */
         void *rel;
@@ -64 +61 @@
         void *jmp_rel;
         size_t plt_rel_sz;
+        /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
+        int plt_rel;
 
         /** Pointer to PLT/GOT (processor-specific) */

uspace/lib/c/include/rtld/module.h

@@ -44 +44 @@
 extern void module_process_relocs(module_t *);
 extern module_t *module_find(rtld_t *, const char *);
-extern module_t *module_load(rtld_t *, const char *);
-extern void module_load_deps(module_t *);
+extern module_t *module_load(rtld_t *, const char *, mlflags_t);
+extern void module_load_deps(module_t *, mlflags_t);
 extern module_t *module_by_id(rtld_t *, unsigned long);
 

uspace/lib/c/include/rtld/symbol.h

@@ -43 +43 @@
         /** No flags */
         ssf_none = 0,
-        /** Do not search tree root */
-        ssf_noroot = 0x1
+        /** Do not search in the executable */
+        ssf_noexec = 0x1
 } symbol_search_flags_t;
 
-extern elf_symbol_t *symbol_bfs_find(const char *, module_t *,
-    symbol_search_flags_t, module_t **);
+extern elf_symbol_t *symbol_bfs_find(const char *, module_t *, module_t **);
 extern elf_symbol_t *symbol_def_find(const char *, module_t *,
     symbol_search_flags_t, module_t **);