summaryrefslogtreecommitdiff
path: root/compiler/utils/arm/assembler_arm.cc
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-12-13 14:00:36 -0800
committer Elliott Hughes <enh@google.com> 2013-12-13 14:00:36 -0800
commit368159762f69db8a014724bbc5e04e343b586aa5 (patch)
tree0e77122c9f0fed07a69ad203bf50e08f5ee8e699 /compiler/utils/arm/assembler_arm.cc
parentcf28cbff9f0557dea9ed60358a956859ba1b56aa (diff)
Use dmb.
We don't support ARM processors that don't have dmb anyway. Change-Id: I41b15a1592febcc0b33d93c291431d00692a2928
Diffstat (limited to 'compiler/utils/arm/assembler_arm.cc')
-rw-r--r--compiler/utils/arm/assembler_arm.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc
index f0d11d8f90..828dffafa1 100644
--- a/compiler/utils/arm/assembler_arm.cc
+++ b/compiler/utils/arm/assembler_arm.cc
@@ -1742,17 +1742,8 @@ void ArmAssembler::Copy(FrameOffset /*dst*/, Offset /*dest_offset*/, FrameOffset
void ArmAssembler::MemoryBarrier(ManagedRegister mscratch) {
CHECK_EQ(mscratch.AsArm().AsCoreRegister(), R12);
#if ANDROID_SMP != 0
-#if defined(__ARM_HAVE_DMB)
int32_t encoding = 0xf57ff05f; // dmb
Emit(encoding);
-#elif defined(__ARM_HAVE_LDREX_STREX)
- LoadImmediate(R12, 0);
- int32_t encoding = 0xee07cfba; // mcr p15, 0, r12, c7, c10, 5
- Emit(encoding);
-#else
- LoadImmediate(R12, 0xffff0fa0); // kuser_memory_barrier
- blx(R12);
-#endif
#endif
}