commit c7706a02ad90ab73f3a056040d2c4a3464ab1ab1
author Elliott Hughes <enh@google.com> Wed Jul 30 22:15:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 29 21:36:05 2014 +0000
tree 177c6035b2ef52cb779fb38f1688e74f6dfd0002
parent 18a1bbe6e18770694d489f2e140e779dc59fde86
parent bc5a3ec6df66d2456667ddf1d6dfaf623552169d

Merge "[MIPSR6] Use C-coded string ops on mips32r6/mips64r6"

libc/arch-mips/mips.mk

diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk
index cb76985..bf3b8ae 100644
--- a/libc/arch-mips/mips.mk
+++ b/libc/arch-mips/mips.mk
@@ -59,10 +59,21 @@
     arch-mips/bionic/setjmp.S \
     arch-mips/bionic/sigsetjmp.S \
     arch-mips/bionic/syscall.S \
+
+ifndef ARCH_MIPS_REV6
+libc_bionic_src_files_mips += \
     arch-mips/string/memcpy.S \
     arch-mips/string/memset.S \
     arch-mips/string/mips_strlen.c \
 
+else
+libc_bionic_src_files_mips += \
+    bionic/memcpy.cpp \
+    bionic/memset.c
+libc_common_src_files_mips += \
+    upstream-openbsd/lib/libc/string/strlen.c
+endif
+
 libc_netbsd_src_files_mips := \
     upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \