summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-03-27 13:49:44 -0700
committerElliott Hughes <enh@google.com>2012-03-28 19:21:59 -0700
commitdeaac40ea7e7d3754d917808fcc1aad52d8f52b7 (patch)
tree5bfe9b2b33058e2786de5a75ae0c3f9c3226cf62
parent7a967b3d4468ab56bf1b75ebd4d7bf9e6798761b (diff)
downloadart-deaac40ea7e7d3754d917808fcc1aad52d8f52b7.zip
art-deaac40ea7e7d3754d917808fcc1aad52d8f52b7.tar.gz
art-deaac40ea7e7d3754d917808fcc1aad52d8f52b7.tar.bz2
Fix the C++ compilation part of the Mac build.
(cherry picked from commit b755f82c7096aa31d5d11b124bcf5fe14ab35a47) Change-Id: Icf352a57e6c99409a3153b4163d7cc6d01bd18f0
-rw-r--r--src/compiler/codegen/x86/ArchUtility.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/codegen/x86/ArchUtility.cc b/src/compiler/codegen/x86/ArchUtility.cc
index fa94db3..6c54e34 100644
--- a/src/compiler/codegen/x86/ArchUtility.cc
+++ b/src/compiler/codegen/x86/ArchUtility.cc
@@ -90,7 +90,7 @@ std::string buildInsnString(const char *fmt, LIR *lir, unsigned char* baseAddr)
break;
case 't':
buf += StringPrintf("0x%08x (L%p)",
- (intptr_t)baseAddr + lir->offset + operand,
+ reinterpret_cast<uint32_t>(baseAddr) + lir->offset + operand,
lir->target);
break;
default: