am 0da2a8eb: am af00228b: Revert "libc: memmove(): non-overlapping block optim."

Merge commit '0da2a8eb8728395867ec8a669e0aee2f243113db'

* commit '0da2a8eb8728395867ec8a669e0aee2f243113db':
  Revert "libc: memmove(): non-overlapping block optim."
This commit is contained in:
Marco Nelissen 2010-09-28 13:20:45 -07:00 committed by Android Git Automerger
commit abdb3695b2

View File

@ -31,11 +31,7 @@ void *memmove(void *dst, const void *src, size_t n)
{
const char *p = src;
char *q = dst;
/* we can use highgly-optimized memcpy() if the destination
* is before the source, or if the two blocks are non-overlapping
*/
if (__builtin_expect((q < p || (q-p) <= (ptrdiff_t)n), 1)) {
if (__builtin_expect(q < p, 1)) {
return memcpy(dst, src, n);
} else {
#define PRELOAD_DISTANCE 64