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

FORTIFY_SOURCE: revert memcpy changes.

Browse Source 
Performance regressions.  Hopefully this is a temporary
rollback.

Bug: 6821003
Change-Id: I84abbb89e1739d506b583f2f1668f31534127764
This commit is contained in:
Nick Kralevich
2012-07-13 17:49:10 -07:00
parent e1d909f71e
commit c37fc1ab6a
2 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libc/include/string.h
View File

@@ -93,10 +93,6 @@ extern void __memcpy_src_size_error()
__attribute__((__error__("memcpy called with size bigger than source")));
extern void __memcpy_overlap_error()
__attribute__((__error__("memcpy called with overlapping regions")));
extern void *__memcpy_real(void *, const void *, size_t)
__asm__(__USER_LABEL_PREFIX__ "memcpy");
extern void *__memcpy_chk2(void *, const void *, size_t, size_t, size_t);
__BIONIC_FORTIFY_INLINE
void *memcpy (void *dest, const void *src, size_t copy_amount) {
@@ -118,11 +114,7 @@ void *memcpy (void *dest, const void *src, size_t copy_amount) {
__memcpy_overlap_error();
}
if (__builtin_constant_p(copy_amount) && __builtin_constant_p(d - s)) {
return __memcpy_real(dest, src, copy_amount);
}
return __memcpy_chk2(dest, src, copy_amount, d_len, s_len);
return __builtin___memcpy_chk(dest, src, copy_amount, d_len);
}
__BIONIC_FORTIFY_INLINE