summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2013-08-08 19:12:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-08 19:12:20 +0000
commit632fd5183a611b80e009be36f881f572acc41619 (patch)
tree7fb2ceee3880209407dee159ce67222026624211
parente2066293e8279641d4abd13ec3fbdd6f42def83d (diff)
parentb922ed349893c9a5e62eca0de4ad32a4851484d1 (diff)
downloadbionic-632fd5183a611b80e009be36f881f572acc41619.zip
bionic-632fd5183a611b80e009be36f881f572acc41619.tar.gz
bionic-632fd5183a611b80e009be36f881f572acc41619.tar.bz2
Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
-rw-r--r--libc/arch-arm/generic/generic.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/arch-arm/generic/generic.mk b/libc/arch-arm/generic/generic.mk
index 0b3f644..c3a5aa5 100644
--- a/libc/arch-arm/generic/generic.mk
+++ b/libc/arch-arm/generic/generic.mk
@@ -2,5 +2,5 @@ $(call libc-add-cpu-variant-src,MEMCPY,arch-arm/generic/bionic/memcpy.S)
$(call libc-add-cpu-variant-src,MEMSET,arch-arm/generic/bionic/memset.S)
$(call libc-add-cpu-variant-src,STRCAT,string/strcat.c)
$(call libc-add-cpu-variant-src,STRCMP,arch-arm/generic/bionic/strcmp.S)
-$(call libc-add-cpu-variant-src,STRCPY,arch-arm/generic/bionic/strcpy.c)
+$(call libc-add-cpu-variant-src,STRCPY,arch-arm/generic/bionic/strcpy.S)
$(call libc-add-cpu-variant-src,STRLEN,arch-arm/generic/bionic/strlen.c)