summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Sullins <jcsullins@gmail.com>2014-03-05 12:15:18 -0600
committerJames Sullins <jcsullins@gmail.com>2014-03-05 12:15:18 -0600
commitb64022be031b94c99ae02d0644b183853f9bd54a (patch)
treefe709ccc48678835f63fc89e47b15accc9133c66
parent2bdcb87365009cd68fe441b3c3e471de2f6608e1 (diff)
downloadbionic-b64022be031b94c99ae02d0644b183853f9bd54a.zip
bionic-b64022be031b94c99ae02d0644b183853f9bd54a.tar.gz
bionic-b64022be031b94c99ae02d0644b183853f9bd54a.tar.bz2
libc: Fix memchr inclusion on scorpion
Change-Id: I0f4d31c85c8671be9790feab03469f89520763b7
-rw-r--r--libc/arch-arm/scorpion/scorpion.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/arch-arm/scorpion/scorpion.mk b/libc/arch-arm/scorpion/scorpion.mk
index 52bf78b..fb893f0 100644
--- a/libc/arch-arm/scorpion/scorpion.mk
+++ b/libc/arch-arm/scorpion/scorpion.mk
@@ -2,6 +2,7 @@ $(call libc-add-cpu-variant-src,MEMCPY,arch-arm/cortex-a15/bionic/memcpy.S)
$(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)
+$(call libc-add-cpu-variant-src,BCOPY,)
# Use cortex-a15 versions of strcat/strcpy/strlen.
$(call libc-add-cpu-variant-src,STRCAT,arch-arm/cortex-a15/bionic/strcat.S)
$(call libc-add-cpu-variant-src,STRCPY,arch-arm/cortex-a15/bionic/strcpy.S)
@@ -9,4 +10,4 @@ $(call libc-add-cpu-variant-src,STRLEN,arch-arm/cortex-a15/bionic/strlen.S)
$(call libc-add-cpu-variant-src,__STRCAT_CHK,arch-arm/cortex-a15/bionic/__strcat_chk.S)
$(call libc-add-cpu-variant-src,__STRCPY_CHK,arch-arm/cortex-a15/bionic/__strcpy_chk.S)
-#include bionic/libc/arch-arm/generic/generic.mk
+include bionic/libc/arch-arm/generic/generic.mk