Merge "Fix Android build for mclinker."
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;
}
}
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());