diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-28 14:46:56 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-28 14:46:56 -0800 |
| commit | 739ba352cb14348c5226be8a87ac0c9f30db7e9c (patch) | |
| tree | 6deb7d07b21111ba1e942c1cfc74a98e204350db | |
| parent | 8548390323252cb50baebb266abdbf58946de03e (diff) | |
| parent | f2544623ce6c2507b0fa6e8ab275f26f1547b853 (diff) | |
| download | bionic-739ba352cb14348c5226be8a87ac0c9f30db7e9c.zip bionic-739ba352cb14348c5226be8a87ac0c9f30db7e9c.tar.gz bionic-739ba352cb14348c5226be8a87ac0c9f30db7e9c.tar.bz2 | |
Merge remote-tracking branch 'github/cm-11.0' into HEAD
| -rw-r--r-- | libc/arch-arm/krait/krait.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libc/arch-arm/krait/krait.mk b/libc/arch-arm/krait/krait.mk index 970053d..d1f0608 100644 --- a/libc/arch-arm/krait/krait.mk +++ b/libc/arch-arm/krait/krait.mk @@ -1,4 +1,8 @@ -$(call libc-add-cpu-variant-src,MEMCPY,arch-arm/krait/bionic/memcpy.S) +ifeq ($(TARGET_USE_KINGFISHER_OPTIMIZATION),true) + $(call libc-add-cpu-variant-src,MEMCPY,arch-arm/cortex-a9/bionic/memcpy.S) +else + $(call libc-add-cpu-variant-src,MEMCPY,arch-arm/krait/bionic/memcpy.S) +endif $(call libc-add-cpu-variant-src,MEMSET,arch-arm/krait/bionic/memset.S) $(call libc-add-cpu-variant-src,STRCMP,arch-arm/krait/bionic/strcmp.S) $(call libc-add-cpu-variant-src,MEMMOVE,arch-arm/krait/bionic/memmove.S) |