Changeset 04803bf in mainline for uspace/lib/c/rtld/include

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 changes (needs fixes).

Location:

uspace/lib/c/rtld/include

Files:

• dynamic.h (moved) (moved from uspace/lib/libc/rtld/include/dynamic.h ) (1 diff)
• elf_dyn.h (moved) (moved from uspace/lib/libc/rtld/include/elf_dyn.h )
• module.h (moved) (moved from uspace/lib/libc/rtld/include/module.h ) (1 diff)
• rtld.h (moved) (moved from uspace/lib/libc/rtld/include/rtld.h )
• rtld_arch.h (moved) (moved from uspace/lib/libc/rtld/include/rtld_arch.h )
• symbol.h (moved) (moved from uspace/lib/libc/rtld/include/symbol.h ) (1 diff)

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

@@ -79 +79 @@
         size_t sym_ent;
 
-        void *init;     /**< Module initialization code */
-        void *fini;     /**< Module cleanup code */
+        void *init;             /**< Module initialization code */
+        void *fini;             /**< Module cleanup code */
 
-        char *soname;   /**< Library identifier */
-        char *rpath;    /**< Library search path list */
+        const char *soname;     /**< Library identifier */
+        char *rpath;            /**< Library search path list */
 
         bool symbolic;

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

@@ -62 +62 @@
 
 void module_process_relocs(module_t *m);
-module_t *module_find(char *name);
-module_t *module_load(char *name);
+module_t *module_find(const char *name);
+module_t *module_load(const char *name);
 void module_load_deps(module_t *m);
 

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

@@ -39 +39 @@
 #include <elf.h>
 
-elf_symbol_t *symbol_bfs_find(char *name, module_t *start, module_t **mod);
-elf_symbol_t *symbol_def_find(char *name, module_t *origin, module_t **mod);
-uintptr_t symbol_get_addr(elf_symbol_t *sym, module_t *m);
+elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod);
+elf_symbol_t *symbol_def_find(const char *name, module_t *origin, module_t **mod);
+void *symbol_get_addr(elf_symbol_t *sym, module_t *m);
 
 #endif