OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
385c07a
)
Fix mips64 build. Replace explicit cast with static_cast
author
Nikola Veljkovic
<Nikola.Veljkovic@imgtec.com>
Wed, 28 Jan 2015 15:18:52 +0000
(16:18 +0100)
committer
Nikola Veljkovic
<Nikola.Veljkovic@imgtec.com>
Wed, 28 Jan 2015 15:19:18 +0000
(16:19 +0100)
Change-Id: Ib08fbe8bb832884a3eb33904fe4d490759116cb2
linker/linker_mips.cpp
patch
|
blob
|
history
diff --git
a/linker/linker_mips.cpp
b/linker/linker_mips.cpp
index
eb2ae84
..
7fbde3d
100644
(file)
--- a/
linker/linker_mips.cpp
+++ b/
linker/linker_mips.cpp
@@
-70,8
+70,8
@@
bool soinfo::relocate(ElfW(Rel)* rel, unsigned count, const soinfo_list_t& globa
if (ELF64_R_TYPE2(rel->r_info) != R_MIPS_64 ||
ELF64_R_TYPE3(rel->r_info) != R_MIPS_NONE) {
DL_ERR("Unexpected compound relocation type:%d type2:%d type3:%d @ %p (%zu)",
- type,
(unsigned)ELF64_R_TYPE2(rel->r_info
),
-
(unsigned)ELF64_R_TYPE3(rel->r_info
), rel, idx);
+ type,
static_cast<unsigned>(ELF64_R_TYPE2(rel->r_info)
),
+
static_cast<unsigned>(ELF64_R_TYPE3(rel->r_info)
), rel, idx);
return false;
}
#endif