summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2014-09-17 06:36:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-17 06:36:19 +0000
commite7c9a387fa190b786b1f7becfe99cb22a6f2934a (patch)
tree50bd13a10a318077225697bd2a6febd622ba2869
parent34ac60ca16713be227844798f4b20a2f68c8a241 (diff)
parentf240aa8089ea1574a7d799720efb66528f6ceb99 (diff)
downloadbionic-e7c9a387fa190b786b1f7becfe99cb22a6f2934a.zip
bionic-e7c9a387fa190b786b1f7becfe99cb22a6f2934a.tar.gz
bionic-e7c9a387fa190b786b1f7becfe99cb22a6f2934a.tar.bz2
Merge "Fix 64bit build"
-rw-r--r--linker/linker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index c46c1e2..6dfa768 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1877,7 +1877,7 @@ bool soinfo::PrelinkImage() {
break;
case DT_SYMENT:
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;
}
break;
@@ -1932,7 +1932,7 @@ bool soinfo::PrelinkImage() {
break;
case DT_RELAENT:
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;
}
break;
@@ -1954,7 +1954,7 @@ bool soinfo::PrelinkImage() {
break;
case DT_RELENT:
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;
}
break;