summaryrefslogtreecommitdiff
path: root/nuttx/lib/string/Make.defs
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-20 20:59:44 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-20 20:59:44 +0000
commitb73107ca1d89a14d9ba1e77c4fafb524f406ac66 (patch)
treea5e76cf8f8b5ed8fb9114c4f92bacc396ce2a21e /nuttx/lib/string/Make.defs
parentdfeb1d80da3e8cfc5e4a7b978db995401eb97114 (diff)
downloadpx4-nuttx-b73107ca1d89a14d9ba1e77c4fafb524f406ac66.tar.gz
px4-nuttx-b73107ca1d89a14d9ba1e77c4fafb524f406ac66.tar.bz2
px4-nuttx-b73107ca1d89a14d9ba1e77c4fafb524f406ac66.zip
Add Daniel Vik's optimized memcpy as a configuration option
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5240 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/lib/string/Make.defs')
-rw-r--r--nuttx/lib/string/Make.defs10
1 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/lib/string/Make.defs b/nuttx/lib/string/Make.defs
index 6b21c7f14..16add6e89 100644
--- a/nuttx/lib/string/Make.defs
+++ b/nuttx/lib/string/Make.defs
@@ -36,7 +36,7 @@
# Add the string C files to the build
CSRCS += lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memchr.c \
- lib_memccpy.c lib_memcpy.c lib_memcmp.c lib_memmove.c lib_skipspace.c \
+ lib_memccpy.c lib_memcmp.c lib_memmove.c lib_skipspace.c \
lib_strcasecmp.c lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c \
lib_strcspn.c lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \
lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \
@@ -44,6 +44,14 @@ CSRCS += lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memchr.c \
lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c \
lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c
+ifneq ($(CONFIG_ARCH_MEMCPY),y)
+ifeq ($(CONFIG_MEMCPY_VIK),y)
+CSRCS += lib_vikmemcpy.c
+else
+CSRCS += lib_memccpy.c
+endif
+endif
+
# Add the string directory to the build
DEPPATH += --dep-path string