am cddedade: am 924fd920: am 601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."

* commit 'cddedade5b1138d5ddafe5b084923f21bba75526':
  When compiling with clang, don't "fortify_source" the strlen.
This commit is contained in:
Shih-wei Liao 2012-08-06 10:20:47 -07:00 committed by Android Git Automerger
commit ed33635da7

View File

@ -208,6 +208,7 @@ size_t strlcat(char *dest, const char *src, size_t size) {
return __strlcat_chk(dest, src, size, bos);
}
#if !defined(__clang__)
__purefunc extern size_t __strlen_real(const char *)
__asm__(__USER_LABEL_PREFIX__ "strlen");
extern size_t __strlen_chk(const char *, size_t);
@ -223,6 +224,7 @@ size_t strlen(const char *s) {
return __strlen_chk(s, bos);
}
#endif /* !defined(__clang__) */
#endif /* defined(__BIONIC_FORTIFY_INLINE) */