merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0153ff7..baa4bda 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11  Nick Clifton  <nickc@redhat.com>
+
+       * md5.c (md5_process_bytes): Do not assume that memcpy will
+       provide a return value.
+
 2008-02-19  Ben Elliston  <bje@au.ibm.com>
 
        PR other/12618

diff --git a/libiberty/md5.c b/libiberty/md5.c
index 83e0beb..9de9d88 100644 (file)
--- a/libiberty/md5.c
+++ b/libiberty/md5.c
@@ -234,7 +234,8 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
       if (UNALIGNED_P (buffer))
         while (len > 64)
           {
-            md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+           memcpy (ctx->buffer, buffer, 64);
+            md5_process_block (ctx->buffer, 64, ctx);
             buffer = (const char *) buffer + 64;
             len -= 64;
           }