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

am fe7d7d46: am 92133ca4: am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"

Browse Source 
* commit 'fe7d7d4693463945155b8548f9c33db5b3c90377':
  disable _FORTIFY_SOURCE under clang
This commit is contained in:
Nick Kralevich 2012-08-29 14:09:32 -07:00 committed by Android Git Automerger
commit 29e526527c
4 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/include/fcntl.h
View File

@ -51,14 +51,6 @@ extern int creat(const char* path, mode_t mode);
#if defined(__BIONIC_FORTIFY_INLINE) #if defined(__BIONIC_FORTIFY_INLINE)
# if !defined(__clang__)
/*
* Clang doesn't have support for __builtin_va_arg_pack()
* and __builtin_va_arg_pack_len()
*
* http://clang.llvm.org/docs/UsersManual.html#c_unimpl_gcc
*/
extern void __creat_error() extern void __creat_error()
__attribute__((__error__ ("called with O_CREAT, but missing mode"))); __attribute__((__error__ ("called with O_CREAT, but missing mode")));
extern void __too_many_args_error() extern void __too_many_args_error()
@ -109,7 +101,6 @@ int openat(int dirfd, const char *pathname, int flags, ...) {
return __openat_real(dirfd, pathname, flags, __builtin_va_arg_pack()); return __openat_real(dirfd, pathname, flags, __builtin_va_arg_pack());
} }
#endif /* !defined(__clang__) */
#endif /* defined(__BIONIC_FORTIFY_INLINE) */ #endif /* defined(__BIONIC_FORTIFY_INLINE) */
__END_DECLS __END_DECLS

9
libc/include/stdio.h
View File

@ -500,13 +500,6 @@ int vsprintf(char *dest, const char *format, __va_list ap)
__builtin_object_size(dest, 0), format, ap); __builtin_object_size(dest, 0), format, ap);
} }
# if !defined(__clang__)
/*
* Clang doesn't have support for __builtin_va_arg_pack()
* http://clang.llvm.org/docs/UsersManual.html#c_unimpl_gcc
*/
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
__attribute__((__format__ (printf, 3, 4))) __attribute__((__format__ (printf, 3, 4)))
__attribute__((__nonnull__ (3))) __attribute__((__nonnull__ (3)))
@ -525,8 +518,6 @@ int sprintf(char *dest, const char *format, ...)
__builtin_object_size(dest, 0), format, __builtin_va_arg_pack()); __builtin_object_size(dest, 0), format, __builtin_va_arg_pack());
} }
# endif /* !defined(__clang__) */
extern char *__fgets_real(char *, int, FILE *) extern char *__fgets_real(char *, int, FILE *)
__asm__(__USER_LABEL_PREFIX__ "fgets"); __asm__(__USER_LABEL_PREFIX__ "fgets");
extern void __fgets_too_big_error() extern void __fgets_too_big_error()

3
libc/include/string.h
View File

@ -147,7 +147,6 @@ 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()
@ -224,8 +223,6 @@ 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) */

2
libc/include/sys/cdefs.h
View File

@ -501,7 +501,7 @@
#define __BIONIC__ 1 #define __BIONIC__ 1
#include <android/api-level.h> #include <android/api-level.h>
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__clang__)
#define __BIONIC_FORTIFY_INLINE \ #define __BIONIC_FORTIFY_INLINE \
extern inline \ extern inline \
__attribute__ ((always_inline)) \ __attribute__ ((always_inline)) \