Revert 16450:5e8e82e80. Instead remove all arch-specific handling of

memcmp() and hence always use common/lib.c version.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/string.c b/xen/common/string.c
index 5a357430f1335fe60fc19b7c934bc14707fc33d9..562f6cb585d2886774e5319980f5d50099c294e5 100644 (file)
--- a/xen/common/string.c
+++ b/xen/common/string.c
@@ -370,7 +370,6 @@ void * memmove(void * dest,const void *src,size_t count)
 #endif
 
 #ifndef __HAVE_ARCH_MEMCMP
-#undef memcmp
 /**
  * memcmp - Compare two areas of memory
  * @cs: One area of memory

diff --git a/xen/include/asm-x86/string.h b/xen/include/asm-x86/string.h
index 5921d22c85a59eebcf561b772d772575463965b1..496b22754fccf8742f95077ad130641b4cb02c8d 100644 (file)
--- a/xen/include/asm-x86/string.h
+++ b/xen/include/asm-x86/string.h
@@ -109,10 +109,6 @@ void *__memcpy(void *t, const void *f, size_t n)
 #define __HAVE_ARCH_MEMMOVE
 extern void *memmove(void *dest, const void *src, size_t n);
 
-/* Some versions of gcc emit references to memcmp despite this macro defn. */
-/*#define __HAVE_ARCH_MEMCMP*/
-#define memcmp __builtin_memcmp
-
 static inline void *__memset_generic(void *s, char c, size_t count)
 {
     long d0, d1;