reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 14:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

loader: Avoid ELF32_ST_INFO macro that is missing on Android.

Browse Source
This commit is contained in:
Alexandre Julliard 2014-07-24 20:34:39 +02:00
parent 97d8ae9e7e
commit 8b4ed00b59
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
loader/preloader.c
View File

@ -999,7 +999,8 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
do do
{ {
if ((chains[idx] & ~1u) == (hash & ~1u) && if ((chains[idx] & ~1u) == (hash & ~1u) &&
symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL &&
ELF32_ST_TYPE(symtab[idx].st_info) == type &&
!wld_strcmp( strings + symtab[idx].st_name, var )) !wld_strcmp( strings + symtab[idx].st_name, var ))
goto found; goto found;
} while (!(chains[idx++] & 1u)); } while (!(chains[idx++] & 1u));
@ -1011,9 +1012,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
const Elf32_Word *buckets = hashtab + 2; const Elf32_Word *buckets = hashtab + 2;
const Elf32_Word *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; idx = chains[idx])
{ {
if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL &&
ELF32_ST_TYPE(symtab[idx].st_info) == type &&
!wld_strcmp( strings + symtab[idx].st_name, var )) !wld_strcmp( strings + symtab[idx].st_name, var ))
goto found; goto found;
} }