generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 18661cd8: am 3780aba6: Merge "Fix mips64 build. Replace explicit cast with static_cast"

Browse Source 
* commit '18661cd8881dfce34306242011198128867777bb':
  Fix mips64 build. Replace explicit cast with static_cast
This commit is contained in:
Dimitry Ivanov
2015-01-28 17:42:47 +00:00
committed by Android Git Automerger
parent c10cfc0520 18661cd888
commit c6c624fc37
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linker/linker_mips.cpp
View File

@@ -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 || if (ELF64_R_TYPE2(rel->r_info) != R_MIPS_64 ||
ELF64_R_TYPE3(rel->r_info) != R_MIPS_NONE) { ELF64_R_TYPE3(rel->r_info) != R_MIPS_NONE) {
DL_ERR("Unexpected compound relocation type:%d type2:%d type3:%d @ %p (%zu)", DL_ERR("Unexpected compound relocation type:%d type2:%d type3:%d @ %p (%zu)",
type, (unsigned)ELF64_R_TYPE2(rel->r_info), type, static_cast<unsigned>(ELF64_R_TYPE2(rel->r_info)),
(unsigned)ELF64_R_TYPE3(rel->r_info), rel, idx); static_cast<unsigned>(ELF64_R_TYPE3(rel->r_info)), rel, idx);
return false; return false;
} }
#endif #endif