From: Joshua W. Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 1 Sep 2009 22:35:35 +0000 (-0700)
Subject: Git cherry-pick of commit a050d2a5e722876623a70d501c3cdfedfce8b5ce
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af95888b07369ead5620d266bde16d79f8e2f95;p=thirdparty%2Fglibc.git

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 9face0b0aea..928c74aff46 100644
--- 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 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