[commits] r10584 - in /fsf/trunk/libc: ChangeLog sysdeps/powerpc/powerpc32/power7/memcpy.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat May 29 00:03:16 2010
New Revision: 10584

Log:
Import glibc-mainline for 2010-05-29

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat May 29 00:03:16 2010
@@ -1,3 +1,7 @@
+2010-05-28  Luis Machado  <luisgpm@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
+
 2010-05-26  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	[BZ #11640]

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S Sat May 29 00:03:16 2010
@@ -365,7 +365,7 @@
 	addi    3,3,8
 0:
 	clrlwi  10,12,28      /* Check alignment of SRC.  */
-	srdi    9,31,4	      /* Number of full quadwords remaining.  */
+	srwi    9,31,4	      /* Number of full quadwords remaining.  */
 
 	/* The proper alignment is present, it is OK to copy the bytes now.  */
 L(copy_GE_32_unaligned_cont):
@@ -375,7 +375,7 @@
 	li      6,16	      /* Index for 16-bytes offsets.  */
 	li	7,32	      /* Index for 32-bytes offsets.  */
 	cmplwi  cr1,11,0
-	srdi    8,31,5	      /* Setup the loop counter.  */
+	srwi    8,31,5	      /* Setup the loop counter.  */
 	mr      10,3
 	mr      11,12
 	mtcrf   0x01,9