commit abdb3695b21631ace52123fbe68f86fa4476a4b0
author Marco Nelissen <marcone@google.com> Tue Sep 28 13:20:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 28 13:20:45 2010 -0700
tree 0dbde1b5b77af3c4710d033b22d7628fa20f2782
parent 319de1758cca4efcd18be773aba6c0b7e36dcbaf
parent 0da2a8eb8728395867ec8a669e0aee2f243113db

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

Merge commit '0da2a8eb8728395867ec8a669e0aee2f243113db'

* commit '0da2a8eb8728395867ec8a669e0aee2f243113db':
  Revert "libc: memmove(): non-overlapping block optim."

libc/string/memmove.c

diff --git a/libc/string/memmove.c b/libc/string/memmove.c
index 948a766..fcaf4ee 100644
--- a/libc/string/memmove.c
+++ b/libc/string/memmove.c
@@ -31,11 +31,7 @@
 {
   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