commit b5f0464d825ee1ef80e8652a12b0743433020ab4
author Dmitriy Ivanov <dimitry@google.com> Wed Sep 17 06:53:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 06:53:52 2014 +0000
tree 23fcf2fbcaea0ecc539b71075d0744bb4314791e
parent f5a56f21806a3535d3e32b172b417bb4cedf00f5
parent e7c9a387fa190b786b1f7becfe99cb22a6f2934a

am e7c9a387: Merge "Fix 64bit build"

* commit 'e7c9a387fa190b786b1f7becfe99cb22a6f2934a':
  Fix 64bit build

linker/linker.cpp

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 @@
         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 @@
         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 @@
         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;