generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 63c74b2c: am 6c55034a: am 86d98962: Merge "Fix mips build."

Browse Source 
* commit '63c74b2c2281b605f7946c707f756835ce83bd44':
  Fix mips build.
This commit is contained in:
Elliott Hughes 2015-01-27 23:42:53 +00:00 committed by Android Git Automerger
commit 8d71a40c79
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/arch-mips/mips.mk
View File

@ -23,12 +23,12 @@ libc_openbsd_src_files_mips += \
# #
libc_bionic_src_files_mips += \ libc_bionic_src_files_mips += \
arch-mips/string/memcmp.c \
bionic/__memcpy_chk.cpp \ bionic/__memcpy_chk.cpp \
bionic/__memset_chk.cpp \ bionic/__memset_chk.cpp \
bionic/__strcpy_chk.cpp \ bionic/__strcpy_chk.cpp \
bionic/__strcat_chk.cpp \ bionic/__strcat_chk.cpp \
bionic/memchr.c \ bionic/memchr.c \
bionic/memcmp.c \
bionic/memrchr.c \ bionic/memrchr.c \
bionic/strchr.cpp \ bionic/strchr.cpp \
bionic/strnlen.c \ bionic/strnlen.c \
@ -78,11 +78,9 @@ libc_bionic_src_files_mips += \
else else
libc_bionic_src_files_mips += \ libc_bionic_src_files_mips += \
bionic/memset.c \ arch-mips/string/memcpy.c \
arch-mips/string/memset.c \
libc_openbsd_src_files_mips += \ arch-mips/string/strlen.c \
upstream-openbsd/lib/libc/string/memcpy.c \
upstream-openbsd/lib/libc/string/strlen.c \
endif endif

0
libc/bionic/memcmp.c → libc/arch-mips/string/memcmp.c
View File

8
libc/upstream-openbsd/lib/libc/string/memcpy.c → libc/arch-mips/string/memcpy.c
View File

@ -57,14 +57,6 @@ memcpy(void *dst0, const void *src0, size_t length)
if (length == 0 || dst == src) /* nothing to do */ if (length == 0 || dst == src) /* nothing to do */
goto done; goto done;
if ((dst < src && dst + length > src) ||
(src < dst && src + length > dst)) {
struct syslog_data sdata = SYSLOG_DATA_INIT;
syslog_r(LOG_CRIT, &sdata, "backwards memcpy");
abort();
}
/* /*
* Macros: loop-t-times; and loop-t-times, t>0 * Macros: loop-t-times; and loop-t-times, t>0
*/ */

0
libc/bionic/memset.c → libc/arch-mips/string/memset.c
View File

0
libc/upstream-openbsd/lib/libc/string/strlen.c → libc/arch-mips/string/strlen.c
View File

8
libc/arch-mips64/mips64.mk
View File

@ -10,12 +10,14 @@ libc_bionic_src_files_mips64 += \
bionic/__strcpy_chk.cpp \ bionic/__strcpy_chk.cpp \
bionic/__strcat_chk.cpp \ bionic/__strcat_chk.cpp \
bionic/memchr.c \ bionic/memchr.c \
bionic/memcmp.c \
bionic/memrchr.c \ bionic/memrchr.c \
bionic/memset.c \
bionic/strchr.cpp \ bionic/strchr.cpp \
bionic/strnlen.c \ bionic/strnlen.c \
bionic/strrchr.cpp \ bionic/strrchr.cpp \
arch-mips/string/memcmp.c \
arch-mips/string/memcpy.c \
arch-mips/string/memset.c \
arch-mips/string/strlen.c \
libc_freebsd_src_files_mips64 += \ libc_freebsd_src_files_mips64 += \
upstream-freebsd/lib/libc/string/wcscat.c \ upstream-freebsd/lib/libc/string/wcscat.c \
@ -28,7 +30,6 @@ libc_freebsd_src_files_mips64 += \
upstream-freebsd/lib/libc/string/wmemmove.c \ upstream-freebsd/lib/libc/string/wmemmove.c \
libc_openbsd_src_files_mips64 += \ libc_openbsd_src_files_mips64 += \
upstream-openbsd/lib/libc/string/memcpy.c \
upstream-openbsd/lib/libc/string/memmove.c \ upstream-openbsd/lib/libc/string/memmove.c \
upstream-openbsd/lib/libc/string/stpcpy.c \ upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \ upstream-openbsd/lib/libc/string/stpncpy.c \
@ -37,7 +38,6 @@ libc_openbsd_src_files_mips64 += \
upstream-openbsd/lib/libc/string/strcpy.c \ upstream-openbsd/lib/libc/string/strcpy.c \
upstream-openbsd/lib/libc/string/strlcat.c \ upstream-openbsd/lib/libc/string/strlcat.c \
upstream-openbsd/lib/libc/string/strlcpy.c \ upstream-openbsd/lib/libc/string/strlcpy.c \
upstream-openbsd/lib/libc/string/strlen.c \
upstream-openbsd/lib/libc/string/strncat.c \ upstream-openbsd/lib/libc/string/strncat.c \
upstream-openbsd/lib/libc/string/strncmp.c \ upstream-openbsd/lib/libc/string/strncmp.c \
upstream-openbsd/lib/libc/string/strncpy.c \ upstream-openbsd/lib/libc/string/strncpy.c \