diff options
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-elf.h | 2 | ||||
| -rw-r--r-- | ldso/include/dl-hash.h | 4 | ||||
| -rw-r--r-- | ldso/include/ldso.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index cbb2100b1..dc4af7bce 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -35,7 +35,7 @@ extern struct elf_resolve * _dl_load_shared_library(int secure, struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname, int trace_loaded_objects); extern struct elf_resolve * _dl_load_elf_shared_library(int secure, - struct dyn_elf **rpnt, char *libname); + struct dyn_elf **rpnt, const char *libname); extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname, int trace_loaded_objects); extern int _dl_linux_resolve(void); diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 34333f40f..edef9d81b 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -60,6 +60,10 @@ struct elf_resolve { #endif ElfW(Addr) mapaddr; +#ifdef __LDSO_STANDALONE_SUPPORT__ + /* Store the entry point from the ELF header (e_entry) */ + ElfW(Addr) l_entry; +#endif enum {elf_lib, elf_executable,program_interpreter, loaded_file} libtype; struct dyn_elf * symbol_scope; unsigned short usage_count; diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 69b5dd75a..120889216 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -144,7 +144,7 @@ extern void _dl_dprintf(int, const char *, ...); # define DL_GET_READY_TO_RUN_EXTRA_ARGS #endif -extern void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, +extern void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv DL_GET_READY_TO_RUN_EXTRA_PARMS); |