Changeset 40d3604 in mainline for uspace/lib/c/include

Timestamp:

2018-04-30T20:12:50Z (8 years ago)

Author:

GitHub <noreply@…>

Parents:

4c5f04f (diff), 64d38cd (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-04-30 20:12:50)

git-committer:

GitHub <noreply@…> (2018-04-30 20:12:50)

Message:

Merge 64d38cd33ec6817c3a5fdd1a7da6d705b0d9d3a2 into 4c5f04f66aa0d34ff3bbed6e9abebf85f59723fb

Location:

uspace/lib/c/include

Files:

• elf/elf_mod.h (modified) (3 diffs)
• types/rtld/rtld.h (modified) (1 diff)

uspace/lib/c/include/elf/elf_mod.h

@@ -78 +78 @@
         entry_point_t entry;
 
+        /** The base address where the file has been loaded.
+         *  Points to the ELF file header.
+         */
+        void *base;
+
         /** ELF interpreter name or NULL if statically-linked */
         const char *interp;
@@ -101 +106 @@
         eld_flags_t flags;
 
-        /** A copy of the ELF file header */
-        elf_header_t *header;
-
         /** Store extracted info here */
         elf_finfo_t *info;
@@ -109 +111 @@
 
 extern const char *elf_error(unsigned int);
-extern int elf_load_file(int, size_t, eld_flags_t, elf_finfo_t *);
-extern int elf_load_file_name(const char *, size_t, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file(int, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file_name(const char *, eld_flags_t, elf_finfo_t *);
 
 #endif

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

@@ -61 +61 @@
         /** List of initial modules */
         list_t imodules;
-
-        /** Temporary hack to place each module at different address. */
-        uintptr_t next_bias;
 } rtld_t;