Skip to content

W
wine-winehq
Commit 1ecfff38 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

loader: ELF hash table entries are always 32-bit on Linux.

parent f8cdbecc
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
loader/preloader.c
View file @ 1ecfff38
...@@ -940,10 +940,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int ...@@ -940,10 +940,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
const ElfW(Dyn) *dyn = NULL; const ElfW(Dyn) *dyn = NULL;
const ElfW(Phdr) *ph; const ElfW(Phdr) *ph;
const ElfW(Sym) *symtab = NULL; const ElfW(Sym) *symtab = NULL;
const Elf_Symndx *hashtab = NULL; const Elf32_Word *hashtab = NULL;
const Elf32_Word *gnu_hashtab = NULL; const Elf32_Word *gnu_hashtab = NULL;
const char *strings = NULL; const char *strings = NULL;
Elf_Symndx idx; Elf32_Word idx;
/* check the values */ /* check the values */
#ifdef DUMP_SYMS #ifdef DUMP_SYMS
...@@ -974,7 +974,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int ...@@ -974,7 +974,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
if( dyn->d_tag == DT_SYMTAB ) if( dyn->d_tag == DT_SYMTAB )
symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr;
if( dyn->d_tag == DT_HASH ) if( dyn->d_tag == DT_HASH )
hashtab = (const Elf_Symndx *)dyn->d_un.d_ptr; hashtab = (const Elf32_Word *)dyn->d_un.d_ptr;
if( dyn->d_tag == DT_GNU_HASH ) if( dyn->d_tag == DT_GNU_HASH )
gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr;
#ifdef DUMP_SYMS #ifdef DUMP_SYMS
...@@ -1007,9 +1007,9 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int ...@@ -1007,9 +1007,9 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
else if (hashtab) /* old style hash table */ else if (hashtab) /* old style hash table */
{ {
const unsigned int hash = wld_elf_hash(var); const unsigned int hash = wld_elf_hash(var);
const Elf_Symndx nbuckets = hashtab[0]; const Elf32_Word nbuckets = hashtab[0];
const Elf_Symndx *buckets = hashtab + 2; const Elf32_Word *buckets = hashtab + 2;
const Elf_Symndx *chains = buckets + nbuckets; const Elf32_Word *chains = buckets + nbuckets;
for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx])
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment