[Commits] r18521 - in /fsf/trunk/libc: ChangeLog sysdeps/powerpc/memmove.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun May 13 00:01:33 2012
New Revision: 18521

Log:
Import glibc-mainline for 2012-05-13

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/powerpc/memmove.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun May 13 00:01:33 2012
@@ -1,3 +1,8 @@
+2012-05-12  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/powerpc/memmove.c (MEMMOVE): Don't return a value if
+	used as bcopy.
+
 2012-05-12  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
 
 	* io/dup3.c (dup3): Rename to __dup3, add weak alias for dup3.

Modified: fsf/trunk/libc/sysdeps/powerpc/memmove.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/memmove.c (original)
+++ fsf/trunk/libc/sysdeps/powerpc/memmove.c Sun May 13 00:01:33 2012
@@ -50,12 +50,12 @@
   unsigned long int srcp = (long int) src;
 
   /* If there is no overlap between ranges, call the builtin memcpy.  */
-  if ( (dstp >= (srcp + len)) || (srcp > (dstp + len)) )
-    return __builtin_memcpy (dest, src, len);
+  if (dstp >= srcp + len || srcp > dstp + len)
+    __builtin_memcpy (dest, src, len);
 
   /* This test makes the forward copying code be used whenever possible.
      Reduces the working set.  */
-  if (dstp - srcp >= len)      /* *Unsigned* compare!  */
+  else if (dstp - srcp >= len)      /* *Unsigned* compare!  */
     {
       /* Copy from the beginning to the end.  */
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits