bitkeeper revision 1.1389.5.30 (427c951f6ULpkuxG36TskUioGnRY9w)

x86_64 gcc sometimes doesn't have builtin memmove. Always use the
version we provide.
Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c
index b45a9197d5..745670b926 100644
--- a/xen/arch/x86/string.c
+++ b/xen/arch/x86/string.c
@@ -8,25 +8,6 @@
 #include <xen/config.h>
 #include <xen/lib.h>
 
-#undef memmove
-void *memmove(void *dest, const void *src, size_t n)
-{
-    int d0, d1, d2;
- 
-    if ( dest < src )
-        return memcpy(dest, src, n);
-
-    __asm__ __volatile__ (
-        "   std         ; "
-        "   rep ; movsb ; "
-        "   cld           "
-        : "=&c" (d0), "=&S" (d1), "=&D" (d2)
-        : "0" (n), "1" (n-1+(const char *)src), "2" (n-1+(char *)dest)
-        : "memory");
-
-    return dest;
-}
-
 #undef memcpy
 void *memcpy(void *dest, const void *src, size_t n)
 {
@@ -61,3 +42,22 @@ void *memset(void *s, int c, size_t n)
 
     return s;
 }
+
+#undef memmove
+void *memmove(void *dest, const void *src, size_t n)
+{
+    int d0, d1, d2;
+ 
+    if ( dest < src )
+        return memcpy(dest, src, n);
+
+    __asm__ __volatile__ (
+        "   std         ; "
+        "   rep ; movsb ; "
+        "   cld           "
+        : "=&c" (d0), "=&S" (d1), "=&D" (d2)
+        : "0" (n), "1" (n-1+(const char *)src), "2" (n-1+(char *)dest)
+        : "memory");
+
+    return dest;
+}