am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
* commit '601a49d39829005803670088da02179e61719551': When compiling with clang, don't "fortify_source" the strlen.
This commit is contained in:
commit
924fd92013
1 changed files with 2 additions and 0 deletions
|
@ -208,6 +208,7 @@ size_t strlcat(char *dest, const char *src, size_t size) {
|
||||||
return __strlcat_chk(dest, src, size, bos);
|
return __strlcat_chk(dest, src, size, bos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(__clang__)
|
||||||
__purefunc extern size_t __strlen_real(const char *)
|
__purefunc extern size_t __strlen_real(const char *)
|
||||||
__asm__(__USER_LABEL_PREFIX__ "strlen");
|
__asm__(__USER_LABEL_PREFIX__ "strlen");
|
||||||
extern size_t __strlen_chk(const char *, size_t);
|
extern size_t __strlen_chk(const char *, size_t);
|
||||||
|
@ -223,6 +224,7 @@ size_t strlen(const char *s) {
|
||||||
|
|
||||||
return __strlen_chk(s, bos);
|
return __strlen_chk(s, bos);
|
||||||
}
|
}
|
||||||
|
#endif /* !defined(__clang__) */
|
||||||
|
|
||||||
|
|
||||||
#endif /* defined(__BIONIC_FORTIFY_INLINE) */
|
#endif /* defined(__BIONIC_FORTIFY_INLINE) */
|
||||||
|
|
Loading…
Reference in a new issue