diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-07-13 01:35:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-13 01:35:00 +0000 |
| commit | 43346101c5bbd80979dc0fa5b2e5587eb6c844e6 (patch) | |
| tree | e3a00bfc1a5ab75ee7958068ae30f701aa916e5a | |
| parent | 8b3f9257b81c322715ba1d28339ecdf64489f8cf (diff) | |
use Elf32_Word instead of uint32_t since that is what the ELF spec refers to
| -rw-r--r-- | ldso/include/dl-hash.h | 8 | ||||
| -rw-r--r-- | ldso/ldso/dl-hash.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 3e6925432..162c7b425 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -32,15 +32,15 @@ struct elf_resolve{ unsigned short usage_count; unsigned short int init_flag; unsigned long rtld_flags; /* RTLD_GLOBAL, RTLD_NOW etc. */ - unsigned int nbucket; - uint32_t *elf_buckets; + Elf32_Word nbucket; + Elf32_Word *elf_buckets; struct init_fini_list *init_fini; struct init_fini_list *rtld_local; /* keep tack of RTLD_LOCAL libs in same group */ /* * These are only used with ELF style shared libraries */ - unsigned long nchain; - uint32_t *chains; + Elf32_Word nchain; + Elf32_Word *chains; unsigned long dynamic_info[DYNAMIC_SIZE]; unsigned long n_phent; diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index 264c30593..19895f143 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -57,7 +57,7 @@ struct dyn_elf *_dl_handles = NULL; /* This is the hash function that is used by the ELF linker to generate the * hash table that each executable and library is required to have. We need * it to decode the hash table. */ -static inline unsigned long _dl_elf_hash(const char *name) +static inline Elf32_Word _dl_elf_hash(const char *name) { unsigned long hash=0; unsigned long tmp; @@ -101,7 +101,7 @@ struct elf_resolve *_dl_add_elf_hash_table(const char *libname, char *loadaddr, unsigned long *dynamic_info, unsigned long dynamic_addr, unsigned long dynamic_size) { - uint32_t *hash_addr; + Elf32_Word *hash_addr; struct elf_resolve *tpnt; int i; @@ -125,7 +125,7 @@ struct elf_resolve *_dl_add_elf_hash_table(const char *libname, tpnt->libtype = loaded_file; if (dynamic_info[DT_HASH] != 0) { - hash_addr = (uint32_t*)dynamic_info[DT_HASH]; + hash_addr = (Elf32_Word*)dynamic_info[DT_HASH]; tpnt->nbucket = *hash_addr++; tpnt->nchain = *hash_addr++; tpnt->elf_buckets = hash_addr; |