Git cherry-pick of commit a050d2a5e722876623a70d501c3cdfedfce8b5ce

Fix use of 64-bit insn in 32-bit memcpy for POWER6.

2009-08-31  Joshua W. Boyer  <jwboyer@linux.vnet.ibm.com>

	* sysdeps/powerpc/powerpc32/power6/memcpy.S: Change srdi instruction
	to srwi in 32-bit memcpy for power6.

diff --git a/ChangeLog b/ChangeLog
index 9face0b0aeaf97a0acb84d6a5fefb4d68ce6871d..928c74aff46874d6fd3becffeb825e47aef4ee26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        * configure.in: Support binutils 2.20.
 
+2009-08-31  Joshua W. Boyer  <jwboyer@linux.vnet.ibm.com>
+
+       * sysdeps/powerpc/powerpc32/power6/memcpy.S: Change srdi instruction
+       to srwi in 32-bit memcpy for power6.
+
 2008-06-12  Ulrich Drepper  <drepper@redhat.com>
 
        * Makeconfig: Undo last change.  Add asflags-cpu to ASFLAGS in the

diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S
index 156b0bd8cc70d5cb16d9ac26e27d4f7a2f3669ff..cafe9174fded5753ae0383d3de5dbd6700ec72a6 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power6/memcpy.S
+++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S
@@ -220,7 +220,7 @@ L(word_unaligned_short):
     subf  10,0,5
     add   12,4,0
     blt   cr6,5f
-    srdi  7,6,16
+    srwi  7,6,16
     bgt          cr6,3f
     sth   6,0(3)
     b     7f