diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-08-12 17:41:54 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-08-13 14:21:12 -0700 |
| commit | 9b3c3cdb62f7142384e6bf2c0cb6e3a76b16f0e3 (patch) | |
| tree | ee468053902f5d58bd0037000bc7031ea77175b2 /compiler/llvm | |
| parent | 7b67bee4f6ca4e634f35f63d1e08e1b05f138e01 (diff) | |
| download | art-9b3c3cdb62f7142384e6bf2c0cb6e3a76b16f0e3.tar.gz art-9b3c3cdb62f7142384e6bf2c0cb6e3a76b16f0e3.tar.bz2 art-9b3c3cdb62f7142384e6bf2c0cb6e3a76b16f0e3.zip | |
C++11 support for ART.
We can now use auto, ranged based loops, etc..
This compiles, the phone boots, and the tests pass.
Depends on:
https://googleplex-android-review.googlesource.com/#/c/342487/
Change-Id: I8ba8ed47d2118e4711668c9c8f973a67beb261b2
Diffstat (limited to 'compiler/llvm')
| -rw-r--r-- | compiler/llvm/runtime_support_builder_thumb2.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/llvm/runtime_support_builder_thumb2.cc b/compiler/llvm/runtime_support_builder_thumb2.cc index f0cb4a2d7b..eff29c8b04 100644 --- a/compiler/llvm/runtime_support_builder_thumb2.cc +++ b/compiler/llvm/runtime_support_builder_thumb2.cc @@ -51,8 +51,8 @@ void RuntimeSupportBuilderThumb2::EmitLockObject(Value* object) { // $2: temp // $3: temp std::string asms; - StringAppendF(&asms, "add $3, $1, #%"PRId32"\n", mirror::Object::MonitorOffset().Int32Value()); - StringAppendF(&asms, "ldr $2, [r9, #%"PRId32"]\n", Thread::ThinLockIdOffset().Int32Value()); + StringAppendF(&asms, "add $3, $1, #%" PRId32 "\n", mirror::Object::MonitorOffset().Int32Value()); + StringAppendF(&asms, "ldr $2, [r9, #%" PRId32 "]\n", Thread::ThinLockIdOffset().Int32Value()); StringAppendF(&asms, "ldrex $0, [$3]\n"); StringAppendF(&asms, "lsl $2, $2, %d\n", LW_LOCK_OWNER_SHIFT); StringAppendF(&asms, "bfi $2, $0, #0, #%d\n", LW_LOCK_OWNER_SHIFT - 1); |