Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8b4ed00b
Commit
8b4ed00b
authored
Jul 24, 2014
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
loader: Avoid ELF32_ST_INFO macro that is missing on Android.
parent
97d8ae9e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
preloader.c
loader/preloader.c
+5
-3
No files found.
loader/preloader.c
View file @
8b4ed00b
...
@@ -999,7 +999,8 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int
...
@@ -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
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment