commit 48b4262286b854f4fa36d2af98cf8d75e87d4dcb
author Stephen Hines <srhines@google.com> Tue Jul 15 18:36:27 2014 -0700
committer Stephen Hines <srhines@google.com> Fri Jul 25 00:48:07 2014 -0700
tree d86721ebcd135274b0f0f235289a14cbe7e436c5
parent a790f0a8f3175183bea088389b3e4ae41813e192

Fix Android build for mclinker.

Change-Id: Icf0039eba69af6ae6a04990f28b686eae4a32ec1

lib/LD/BranchIslandFactory.cpp

diff --git a/lib/LD/BranchIslandFactory.cpp b/lib/LD/BranchIslandFactory.cpp
index fcaa2eb..0147e5f 100644
--- a/lib/LD/BranchIslandFactory.cpp
+++ b/lib/LD/BranchIslandFactory.cpp
@@ -90,7 +90,7 @@
       if (prev != ie) {
         int64_t bwd_off = (int64_t)pFragment.getOffset() + m_MaxBwdBranchRange;
         if ((pFragment.getOffset() > (*prev).offset()) &&
-            (bwd_off <= (*prev).offset())) {
+            (bwd_off <= (int64_t) (*prev).offset())) {
           bwd = &*prev;
         }
       }

lib/Support/MemoryArea.cpp

diff --git a/lib/Support/MemoryArea.cpp b/lib/Support/MemoryArea.cpp
index 548ac72..d796283 100644
--- a/lib/Support/MemoryArea.cpp
+++ b/lib/Support/MemoryArea.cpp
@@ -25,6 +25,7 @@
       llvm::MemoryBuffer::getFile(pFilename, /*FileSize*/ -1,
                                   /*RequiresNullTerminator*/ false);
   if (std::error_code ec = buffer_or_error.getError()) {
+    (void) ec;
     fatal(diag::fatal_cannot_read_input) << pFilename.str();
   }
   m_pMemoryBuffer = std::move(buffer_or_error.get());