am db6fea86: Merge "further cleanup memcpy fortify implementation"

* commit 'db6fea86a5cb70c5aaad61ef6c126557f36e138b':
  further cleanup memcpy fortify implementation
This commit is contained in:
Nick Kralevich 2014-10-05 16:52:37 +00:00 committed by Android Git Automerger
commit 10450b14f7

View File

@ -115,11 +115,7 @@ extern char* basename(const char*) __RENAME(__gnu_basename) __nonnull((1));
__BIONIC_FORTIFY_INLINE
void* memcpy(void* __restrict dest, const void* __restrict src, size_t copy_amount) {
char *d = (char *) dest;
const char *s = (const char *) src;
size_t d_len = __bos0(d);
return __builtin___memcpy_chk(dest, src, copy_amount, d_len);
return __builtin___memcpy_chk(dest, src, copy_amount, __bos0(dest));
}
__BIONIC_FORTIFY_INLINE