From: Joshua W. Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 1 Sep 2009 22:35:35 +0000 (-0700)
Subject: Fix use of 64-bit insn in 32-bit memcpy for POWER6.
X-Git-Tag: glibc-2.10.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f603960ee089375f669788c30375aefc1f5f40b6;p=thirdparty%2Fglibc.git

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

(cherry picked from commit a050d2a5e722876623a70d501c3cdfedfce8b5ce)
---

diff --git a/ChangeLog b/ChangeLog
index 31a9035dd07..d4e0555e386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2009-08-31  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10560]
diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S
index 156b0bd8cc7..cafe9174fde 100644
--- 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