diff options
| -rw-r--r-- | elf/rtld.c | 18 | ||||
| -rw-r--r-- | include/link.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-sysdep.c | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 3e771a93d8..205df43bb2 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -384,7 +384,7 @@ extern struct rtld_global_ro _rtld_local_ro static void dl_main (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv); + elfptr_t *user_entry, ElfW(auxv_t) *auxv); /* These two variables cannot be moved into .data.rel.ro. */ static struct libname_list _dl_rtld_libname; @@ -416,15 +416,15 @@ DL_SYSINFO_IMPLEMENTATION #endif #ifdef DONT_USE_BOOTSTRAP_MAP -static ElfW(Addr) _dl_start_final (void *arg); +static elfptr_t _dl_start_final (void *arg); #else struct dl_start_final_info { struct link_map l; RTLD_TIMING_VAR (start_time); }; -static ElfW(Addr) _dl_start_final (void *arg, - struct dl_start_final_info *info); +static elfptr_t _dl_start_final (void *arg, + struct dl_start_final_info *info); #endif /* These are defined magically by the linker. */ @@ -446,14 +446,14 @@ RTLD_START this function is not inlined (see below). */ #ifdef DONT_USE_BOOTSTRAP_MAP -static inline ElfW(Addr) __attribute__ ((always_inline)) +static inline elfptr_t __attribute__ ((always_inline)) _dl_start_final (void *arg) #else -static ElfW(Addr) __attribute__ ((noinline)) +static elfptr_t __attribute__ ((noinline)) _dl_start_final (void *arg, struct dl_start_final_info *info) #endif { - ElfW(Addr) start_addr; + elfptr_t start_addr; /* Do not use an initializer for these members because it would intefere with __rtld_static_init. */ @@ -515,7 +515,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) # define bootstrap_map info.l #endif -static ElfW(Addr) __attribute_used__ +static elfptr_t __attribute_used__ _dl_start (void *arg) { #ifdef DONT_USE_BOOTSTRAP_MAP @@ -1352,7 +1352,7 @@ _dl_start_args_adjust (int skip_args) static void dl_main (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, + elfptr_t *user_entry, ElfW(auxv_t) *auxv) { struct link_map *main_map; diff --git a/include/link.h b/include/link.h index 79c8a57690..a3548a7a93 100644 --- a/include/link.h +++ b/include/link.h @@ -133,7 +133,7 @@ struct link_map ElfW(Dyn) *l_info[DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM + DT_ADDRNUM]; const ElfW(Phdr) *l_phdr; /* Pointer to program header table in core. */ - ElfW(Addr) l_entry; /* Entry point location. */ + elfptr_t l_entry; /* Entry point location. */ ElfW(Half) l_phnum; /* Number of program header entries. */ ElfW(Half) l_ldnum; /* Number of dynamic segment entries. */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index f8cd388e62..4c407e4f24 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1161,10 +1161,10 @@ extern void *_dl_sysdep_read_whole_file (const char *file, size_t *sizep, After this, file access calls and getenv must work. This is responsible for setting __libc_enable_secure if we need to be secure (e.g. setuid), and for setting _dl_argc and _dl_argv, and then calling _dl_main. */ -extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, +extern elfptr_t _dl_sysdep_start (void **start_argptr, void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, + elfptr_t *user_entry, ElfW(auxv_t) *auxv)) attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index 9e15c5bf69..b77d7fbb0e 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -67,7 +67,7 @@ struct dl_main_arguments { const ElfW(Phdr) *phdr; ElfW(Word) phnum; - ElfW(Addr) user_entry; + elfptr_t user_entry; }; /* Separate function, so that dl_main can be called without the large @@ -95,10 +95,10 @@ _dl_sysdep_parse_arguments (void **start_argptr, args->user_entry = auxv_values[AT_ENTRY]; } -ElfW(Addr) +elfptr_t _dl_sysdep_start (void **start_argptr, void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv)) + elfptr_t *user_entry, ElfW(auxv_t) *auxv)) { __libc_stack_end = DL_STACK_END (start_argptr); |