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

am 3b4c9db2: am df523880: am e2731d98: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."

Browse Source 
* commit '3b4c9db2561233fb81ac0c42b3976deb2e648df0':
  When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
This commit is contained in:
Shih-wei Liao 2012-08-06 11:10:41 -07:00 committed by Android Git Automerger
commit 25ef2bbf01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/string.h
View File

@ -147,6 +147,7 @@ void *memset (void *s, int c, size_t n) {
return __builtin___memset_chk(s, c, n, __builtin_object_size (s, 0)); return __builtin___memset_chk(s, c, n, __builtin_object_size (s, 0));
} }
#if !defined(__clang__)
extern size_t __strlcpy_real(char *, const char *, size_t) extern size_t __strlcpy_real(char *, const char *, size_t)
__asm__(__USER_LABEL_PREFIX__ "strlcpy"); __asm__(__USER_LABEL_PREFIX__ "strlcpy");
extern void __strlcpy_error() extern void __strlcpy_error()
@ -208,7 +209,6 @@ 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);