diff options
Diffstat (limited to 'ldso/ldso')
| -rw-r--r-- | ldso/ldso/dl-elf.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/dl-hash.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/dl-startup.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/ldso.c | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 9c5b3b4fb..923e0cfe7 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -801,7 +801,8 @@ char *_dl_strdup(const char *string) return retval; } -void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off) +void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], + void *debug_addr, DL_LOADADDR_TYPE load_off) { __dl_parse_dynamic_info(dpnt, dynamic_info, debug_addr, load_off); } diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index be702be50..ccf191a70 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -83,7 +83,7 @@ static inline Elf_Symndx _dl_elf_hash(const char *name) * externals properly. */ struct elf_resolve *_dl_add_elf_hash_table(const char *libname, - ElfW(Addr) loadaddr, unsigned long *dynamic_info, unsigned long dynamic_addr, + DL_LOADADDR_TYPE loadaddr, unsigned long *dynamic_info, unsigned long dynamic_addr, attribute_unused unsigned long dynamic_size) { Elf_Symndx *hash_addr; diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index 18658cb26..4115f299c 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -114,7 +114,7 @@ static void * __attribute_used__ _dl_start(unsigned long args) { unsigned int argc; char **argv, **envp; - ElfW(Addr) load_addr; + DL_LOADADDR_TYPE load_addr; ElfW(Addr) got; unsigned long *aux_dat; ElfW(Ehdr) *header; diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 4fe2bd1cb..82eb044bb 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -102,7 +102,7 @@ uintptr_t __guard attribute_relro; #endif static void _dl_run_array_forward(unsigned long array, unsigned long size, - ElfW(Addr) loadaddr) + DL_LOADADDR_TYPE loadaddr) { if (array != 0) { unsigned int j; @@ -173,9 +173,9 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void) } } -void _dl_get_ready_to_run(struct elf_resolve *tpnt, ElfW(Addr) load_addr, - ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, - char **argv) +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) { ElfW(Phdr) *ppnt; ElfW(Dyn) *dpnt; |