summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-29 18:06:20 -0800
committerSteve Kondik <shade@chemlab.org>2013-12-29 18:06:20 -0800
commit56b9ae49eddb69e92dce555b2046622d47e1b1a7 (patch)
treecbd064fb50480d199c98c3e137e27b0c742d06f3
parent3e4bd2d6153f0b72ad7813d3c07c237f9647f788 (diff)
downloadandroid_dalvik-56b9ae49eddb69e92dce555b2046622d47e1b1a7.tar.gz
android_dalvik-56b9ae49eddb69e92dce555b2046622d47e1b1a7.tar.bz2
android_dalvik-56b9ae49eddb69e92dce555b2046622d47e1b1a7.zip
dalvik: Use Bionic's memmove on cortex-a15
Change-Id: Ia313d784cf9e261e0c82f1a6d412eca1731a5034
-rw-r--r--vm/Dvm.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 63090dae7..7c99255bc 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -264,12 +264,16 @@ ifeq ($(dvm_arch),arm)
compiler/template/out/CompilerTemplateAsm-$(dvm_arch_variant).S
endif
ifeq ($(call is-vendor-board-platform,QCOM),true)
- ifeq ($(WITH_QC_PERF),true)
- LOCAL_WHOLE_STATIC_LIBRARIES += libqc-dalvik
- LOCAL_SHARED_LIBRARIES += libqc-opt
- LOCAL_CFLAGS += -DWITH_QC_PERF
+ ifeq ($(WITH_QC_PERF),true)
+ LOCAL_WHOLE_STATIC_LIBRARIES += libqc-dalvik
+ LOCAL_SHARED_LIBRARIES += libqc-opt
+ LOCAL_CFLAGS += -DWITH_QC_PERF
+ endif
+ LOCAL_CFLAGS += -DHAVE_HALFWORD_ATOMIC_MEMMOVE
+ else
+ ifeq ($(TARGET_CPU_VARIANT),cortex-a15)
+ LOCAL_CFLAGS += -DHAVE_HALFWORD_ATOMIC_MEMMOVE
endif
- LOCAL_CFLAGS += -DHAVE_HALFWORD_ATOMIC_MEMMOVE
endif
endif