1.1 --- a/xen/common/string.c	Sat Nov 24 21:46:14 2007 +0000
     1.2 +++ b/xen/common/string.c	Sat Nov 24 22:19:03 2007 +0000
     1.3 @@ -370,7 +370,6 @@ void * memmove(void * dest,const void *s
     1.4  #endif
     1.5  
     1.6  #ifndef __HAVE_ARCH_MEMCMP
     1.7 -#undef memcmp
     1.8  /**
     1.9   * memcmp - Compare two areas of memory
    1.10   * @cs: One area of memory

     2.1 --- a/xen/include/asm-x86/string.h	Sat Nov 24 21:46:14 2007 +0000
     2.2 +++ b/xen/include/asm-x86/string.h	Sat Nov 24 22:19:03 2007 +0000
     2.3 @@ -109,10 +109,6 @@ void *__memcpy(void *t, const void *f, s
     2.4  #define __HAVE_ARCH_MEMMOVE
     2.5  extern void *memmove(void *dest, const void *src, size_t n);
     2.6  
     2.7 -/* Some versions of gcc emit references to memcmp despite this macro defn. */
     2.8 -/*#define __HAVE_ARCH_MEMCMP*/
     2.9 -#define memcmp __builtin_memcmp
    2.10 -
    2.11  static inline void *__memset_generic(void *s, char c, size_t count)
    2.12  {
    2.13      long d0, d1;