commit 09608848edf42fb999d08e59c8c81a62a79a6941
author Dmitriy Ivanov <dimitry@google.com> Tue Sep 16 23:34:20 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Oct 31 17:02:14 2014 -0700
tree a7bdbcb50fb15048ea838d6188cf69889b08d003
parent 634a045c5c2ca1df35f582ed24bb3af0dc1d7151

Fix 64bit build

Bug: 18186310

(cherry picked from commit f240aa8089ea1574a7d799720efb66528f6ceb99)

Change-Id: Id46f1f9be90a17a58fb44d3540095c8c685c9726

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 875335f..f8974eb 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1893,7 +1893,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;
@@ -1948,7 +1948,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;
@@ -1970,7 +1970,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;