From af00228b705b53165c132a22b30c2d6cbb9acd13 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 28 Sep 2010 10:24:20 -0700 Subject: Revert "libc: memmove(): non-overlapping block optim." This reverts commit 80fba9a2fe4eacaabee99cf0bbead872c2792231, which caused the system to not boot anymore, aborting with: "java.lang.RuntimeException: Missing static main on com.android.server.SystemServer". Change-Id: I745e0a23c728cccf5f95a3c7642d544478a4e57e --- libc/string/memmove.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to '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 @@ 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 -- cgit v1.1