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

Fix strchr for basic non-sse case on x86

Browse Source 
Fix source location. Move declaration of __strchr_chk out of
ifdef __BIONIC_FORTIFY which should be available for strchr.cpp
compilation when __BIONIC_FORTIFY is not defined.

Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
This commit is contained in:
Pavel Chupin 2013-07-26 16:50:11 +04:00
parent 99b859cf78
commit 3c4b50fd8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-x86/x86.mk
View File

@ -72,7 +72,7 @@ _LIBC_ARCH_COMMON_SRC_FILES += \
arch-x86/string/bzero.S \
bionic/memrchr.c \
bionic/memchr.c \
string/strchr.cpp \
bionic/strchr.cpp \
string/strrchr.c \
string/index.c \
bionic/strnlen.c \

4
libc/include/string.h
View File

@ -46,6 +46,8 @@ extern void memswap(void *, void *, size_t);
extern char* index(const char *, int) __purefunc;
extern char* strchr(const char *, int) __purefunc;
extern char* __strchr_chk(const char *, int, size_t);
extern char* strrchr(const char *, int) __purefunc;
extern size_t strlen(const char *) __purefunc;
@ -238,8 +240,6 @@ size_t strlen(const char *s) {
return __strlen_chk(s, bos);
}
extern char* __strchr_chk(const char *, int, size_t);
__BIONIC_FORTIFY_INLINE
char* strchr(const char *s, int c) {
size_t bos = __bos(s);