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

am e7c9a387: Merge "Fix 64bit build"

Browse Source 
* commit 'e7c9a387fa190b786b1f7becfe99cb22a6f2934a':
  Fix 64bit build
This commit is contained in:
Dmitriy Ivanov
2014-09-17 06:53:24 +00:00
committed by Android Git Automerger
parent ab1b06a87b e7c9a387fa
commit 415658c922
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@@ -1877,7 +1877,7 @@ bool soinfo::PrelinkImage() {
break; break;
case DT_SYMENT: case DT_SYMENT:
if (d->d_un.d_val != sizeof(ElfW(Sym))) { if (d->d_un.d_val != sizeof(ElfW(Sym))) {
DL_ERR("invalid DT_SYMENT: %d", d->d_un.d_val); DL_ERR("invalid DT_SYMENT: %zd", static_cast<size_t>(d->d_un.d_val));
return false; return false;
} }
break; break;
@@ -1932,7 +1932,7 @@ bool soinfo::PrelinkImage() {
break; break;
case DT_RELAENT: case DT_RELAENT:
if (d->d_un.d_val != sizeof(ElfW(Rela))) { if (d->d_un.d_val != sizeof(ElfW(Rela))) {
DL_ERR("invalid DT_RELAENT: %d", d->d_un.d_val); DL_ERR("invalid DT_RELAENT: %zd", static_cast<size_t>(d->d_un.d_val));
return false; return false;
} }
break; break;
@@ -1954,7 +1954,7 @@ bool soinfo::PrelinkImage() {
break; break;
case DT_RELENT: case DT_RELENT:
if (d->d_un.d_val != sizeof(ElfW(Rel))) { if (d->d_un.d_val != sizeof(ElfW(Rel))) {
DL_ERR("invalid DT_RELENT: %d", d->d_un.d_val); DL_ERR("invalid DT_RELENT: %zd", static_cast<size_t>(d->d_un.d_val));
return false; return false;
} }
break; break;