This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-849-gc7df011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c7df0112025704a914ab5071e8626bba2a5c007f (commit)
      from  dc70356cbfc649af8e39c9a8d509fefd766fa8ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c7df0112025704a914ab5071e8626bba2a5c007f

commit c7df0112025704a914ab5071e8626bba2a5c007f
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Sat May 12 17:40:53 2012 +0200

    Fix warning in powerpc bcopy

diff --git a/ChangeLog b/ChangeLog
index 8a10d6a..6f0b685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/powerpc/memmove.c (MEMMOVE): Don't return a value if
+	used as bcopy.
+
 2012-05-12  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* io/dup3.c (dup3): Rename to __dup3, add weak alias for dup3.
diff --git a/sysdeps/powerpc/memmove.c b/sysdeps/powerpc/memmove.c
index 8918283..1617ece 100644
--- a/sysdeps/powerpc/memmove.c
+++ b/sysdeps/powerpc/memmove.c
@@ -50,12 +50,12 @@ MEMMOVE (a1, a2, len)
   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.  */
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    5 +++++
 sysdeps/powerpc/memmove.c |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]